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

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

copyright: update to 2015...
Jesus Cea -
r24191:8fe5fc8d default
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="http://mercurial.selenic.com/">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="http://mercurial.selenic.com/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="http://mercurial.selenic.com/">Mercurial web site</a>
112 112 and see if your question is already in our list of <a
113 113 href="http://mercurial.selenic.com/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-2014 Matt Mackall and others. See
143 Mercurial is Copyright 2005-2015 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-2010 Matt Mackall and others
24 AppCopyright=Copyright 2005-2015 Matt Mackall and others
25 25 AppName=Mercurial
26 26 #if ARCH == "x64"
27 27 AppVerName=Mercurial {#VERSION} (64-bit)
28 28 OutputBaseFilename=Mercurial-{#VERSION}-x64
29 29 ArchitecturesAllowed=x64
30 30 ArchitecturesInstallIn64BitMode=x64
31 31 #else
32 32 AppVerName=Mercurial {#VERSION}
33 33 OutputBaseFilename=Mercurial-{#VERSION}
34 34 #endif
35 35 InfoAfterFile=contrib/win32/postinstall.txt
36 36 LicenseFile=COPYING
37 37 ShowLanguageDialog=yes
38 38 AppPublisher=Matt Mackall and others
39 39 AppPublisherURL=http://mercurial.selenic.com/
40 40 AppSupportURL=http://mercurial.selenic.com/
41 41 AppUpdatesURL=http://mercurial.selenic.com/
42 42 AppID={{4B95A5F1-EF59-4B08-BED8-C891C46121B3}
43 43 AppContact=mercurial@selenic.com
44 44 DefaultDirName={pf}\Mercurial
45 45 SourceDir=..\..
46 46 VersionInfoDescription=Mercurial distributed SCM (version {#VERSION})
47 VersionInfoCopyright=Copyright 2005-2010 Matt Mackall and others
47 VersionInfoCopyright=Copyright 2005-2015 Matt Mackall and others
48 48 VersionInfoCompany=Matt Mackall and others
49 49 InternalCompressLevel=max
50 50 SolidCompression=true
51 51 SetupIconFile=contrib\win32\mercurial.ico
52 52 AllowNoIcons=true
53 53 DefaultGroupName=Mercurial
54 54 PrivilegesRequired=none
55 55
56 56 [Files]
57 57 Source: contrib\mercurial.el; DestDir: {app}/Contrib
58 58 Source: contrib\vim\*.*; DestDir: {app}/Contrib/Vim
59 59 Source: contrib\zsh_completion; DestDir: {app}/Contrib
60 60 Source: contrib\bash_completion; DestDir: {app}/Contrib
61 61 Source: contrib\tcsh_completion; DestDir: {app}/Contrib
62 62 Source: contrib\tcsh_completion_build.sh; DestDir: {app}/Contrib
63 63 Source: contrib\hgk; DestDir: {app}/Contrib; DestName: hgk.tcl
64 64 Source: contrib\xml.rnc; DestDir: {app}/Contrib
65 65 Source: contrib\mercurial.el; DestDir: {app}/Contrib
66 66 Source: contrib\mq.el; DestDir: {app}/Contrib
67 67 Source: contrib\hgweb.fcgi; DestDir: {app}/Contrib
68 68 Source: contrib\hgweb.wsgi; DestDir: {app}/Contrib
69 69 Source: contrib\win32\ReadMe.html; DestDir: {app}; Flags: isreadme
70 70 Source: contrib\win32\postinstall.txt; DestDir: {app}; DestName: ReleaseNotes.txt
71 71 Source: dist\hg.exe; DestDir: {app}; AfterInstall: Touch('{app}\hg.exe.local')
72 72 #if ARCH == "x64"
73 73 Source: dist\*.dll; Destdir: {app}
74 74 Source: dist\*.pyd; Destdir: {app}
75 75 #else
76 76 Source: dist\python*.dll; Destdir: {app}; Flags: skipifsourcedoesntexist
77 77 Source: dist\msvc*.dll; DestDir: {app}; Flags: skipifsourcedoesntexist
78 78 Source: dist\w9xpopen.exe; DestDir: {app}
79 79 #endif
80 80 Source: dist\Microsoft.VC*.CRT.manifest; DestDir: {app}; Flags: skipifsourcedoesntexist
81 81 Source: dist\library.zip; DestDir: {app}
82 82 Source: dist\add_path.exe; DestDir: {app}
83 83 Source: dist\cacert.pem; 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\default.d\*.rc; DestDir: {app}\default.d
88 88 Source: mercurial\locale\*.*; DestDir: {app}\locale; Flags: recursesubdirs createallsubdirs skipifsourcedoesntexist
89 89 Source: mercurial\templates\*.*; DestDir: {app}\Templates; Flags: recursesubdirs createallsubdirs
90 90 Source: CONTRIBUTORS; DestDir: {app}; DestName: Contributors.txt
91 91 Source: COPYING; DestDir: {app}; DestName: Copying.txt
92 92
93 93 [INI]
94 94 Filename: {app}\Mercurial.url; Section: InternetShortcut; Key: URL; String: http://mercurial.selenic.com/
95 95 Filename: {app}\default.d\editor.rc; Section: ui; Key: editor; String: notepad
96 96 Filename: {app}\default.d\cacerts.rc; Section: web; Key: cacerts; String: {app}\cacert.pem
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,6333 +1,6333 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, 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, commandserver
17 17 import extensions
18 18 from hgweb import server as hgweb_server
19 19 import merge as mergemod
20 20 import minirst, revset, fileset
21 21 import dagparser, context, simplemerge, graphmod, copies
22 22 import random
23 23 import setdiscovery, treediscovery, dagutil, pvec, localrepo
24 24 import phases, obsolete, exchange, bundle2
25 25 import ui as uimod
26 26
27 27 table = {}
28 28
29 29 command = cmdutil.command(table)
30 30
31 31 # Space delimited list of commands that don't require local repositories.
32 32 # This should be populated by passing norepo=True into the @command decorator.
33 33 norepo = ''
34 34 # Space delimited list of commands that optionally require local repositories.
35 35 # This should be populated by passing optionalrepo=True into the @command
36 36 # decorator.
37 37 optionalrepo = ''
38 38 # Space delimited list of commands that will examine arguments looking for
39 39 # a repository. This should be populated by passing inferrepo=True into the
40 40 # @command decorator.
41 41 inferrepo = ''
42 42
43 43 # common command options
44 44
45 45 globalopts = [
46 46 ('R', 'repository', '',
47 47 _('repository root directory or name of overlay bundle file'),
48 48 _('REPO')),
49 49 ('', 'cwd', '',
50 50 _('change working directory'), _('DIR')),
51 51 ('y', 'noninteractive', None,
52 52 _('do not prompt, automatically pick the first choice for all prompts')),
53 53 ('q', 'quiet', None, _('suppress output')),
54 54 ('v', 'verbose', None, _('enable additional output')),
55 55 ('', 'config', [],
56 56 _('set/override config option (use \'section.name=value\')'),
57 57 _('CONFIG')),
58 58 ('', 'debug', None, _('enable debugging output')),
59 59 ('', 'debugger', None, _('start debugger')),
60 60 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
61 61 _('ENCODE')),
62 62 ('', 'encodingmode', encoding.encodingmode,
63 63 _('set the charset encoding mode'), _('MODE')),
64 64 ('', 'traceback', None, _('always print a traceback on exception')),
65 65 ('', 'time', None, _('time how long the command takes')),
66 66 ('', 'profile', None, _('print command execution profile')),
67 67 ('', 'version', None, _('output version information and exit')),
68 68 ('h', 'help', None, _('display help and exit')),
69 69 ('', 'hidden', False, _('consider hidden changesets')),
70 70 ]
71 71
72 72 dryrunopts = [('n', 'dry-run', None,
73 73 _('do not perform actions, just print output'))]
74 74
75 75 remoteopts = [
76 76 ('e', 'ssh', '',
77 77 _('specify ssh command to use'), _('CMD')),
78 78 ('', 'remotecmd', '',
79 79 _('specify hg command to run on the remote side'), _('CMD')),
80 80 ('', 'insecure', None,
81 81 _('do not verify server certificate (ignoring web.cacerts config)')),
82 82 ]
83 83
84 84 walkopts = [
85 85 ('I', 'include', [],
86 86 _('include names matching the given patterns'), _('PATTERN')),
87 87 ('X', 'exclude', [],
88 88 _('exclude names matching the given patterns'), _('PATTERN')),
89 89 ]
90 90
91 91 commitopts = [
92 92 ('m', 'message', '',
93 93 _('use text as commit message'), _('TEXT')),
94 94 ('l', 'logfile', '',
95 95 _('read commit message from file'), _('FILE')),
96 96 ]
97 97
98 98 commitopts2 = [
99 99 ('d', 'date', '',
100 100 _('record the specified date as commit date'), _('DATE')),
101 101 ('u', 'user', '',
102 102 _('record the specified user as committer'), _('USER')),
103 103 ]
104 104
105 105 # hidden for now
106 106 formatteropts = [
107 107 ('T', 'template', '',
108 108 _('display with template (DEPRECATED)'), _('TEMPLATE')),
109 109 ]
110 110
111 111 templateopts = [
112 112 ('', 'style', '',
113 113 _('display using template map file (DEPRECATED)'), _('STYLE')),
114 114 ('T', 'template', '',
115 115 _('display with template'), _('TEMPLATE')),
116 116 ]
117 117
118 118 logopts = [
119 119 ('p', 'patch', None, _('show patch')),
120 120 ('g', 'git', None, _('use git extended diff format')),
121 121 ('l', 'limit', '',
122 122 _('limit number of changes displayed'), _('NUM')),
123 123 ('M', 'no-merges', None, _('do not show merges')),
124 124 ('', 'stat', None, _('output diffstat-style summary of changes')),
125 125 ('G', 'graph', None, _("show the revision DAG")),
126 126 ] + templateopts
127 127
128 128 diffopts = [
129 129 ('a', 'text', None, _('treat all files as text')),
130 130 ('g', 'git', None, _('use git extended diff format')),
131 131 ('', 'nodates', None, _('omit dates from diff headers'))
132 132 ]
133 133
134 134 diffwsopts = [
135 135 ('w', 'ignore-all-space', None,
136 136 _('ignore white space when comparing lines')),
137 137 ('b', 'ignore-space-change', None,
138 138 _('ignore changes in the amount of white space')),
139 139 ('B', 'ignore-blank-lines', None,
140 140 _('ignore changes whose lines are all blank')),
141 141 ]
142 142
143 143 diffopts2 = [
144 144 ('', 'noprefix', None, _('omit a/ and b/ prefixes from filenames')),
145 145 ('p', 'show-function', None, _('show which function each change is in')),
146 146 ('', 'reverse', None, _('produce a diff that undoes the changes')),
147 147 ] + diffwsopts + [
148 148 ('U', 'unified', '',
149 149 _('number of lines of context to show'), _('NUM')),
150 150 ('', 'stat', None, _('output diffstat-style summary of changes')),
151 151 ]
152 152
153 153 mergetoolopts = [
154 154 ('t', 'tool', '', _('specify merge tool')),
155 155 ]
156 156
157 157 similarityopts = [
158 158 ('s', 'similarity', '',
159 159 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
160 160 ]
161 161
162 162 subrepoopts = [
163 163 ('S', 'subrepos', None,
164 164 _('recurse into subrepositories'))
165 165 ]
166 166
167 167 # Commands start here, listed alphabetically
168 168
169 169 @command('^add',
170 170 walkopts + subrepoopts + dryrunopts,
171 171 _('[OPTION]... [FILE]...'),
172 172 inferrepo=True)
173 173 def add(ui, repo, *pats, **opts):
174 174 """add the specified files on the next commit
175 175
176 176 Schedule files to be version controlled and added to the
177 177 repository.
178 178
179 179 The files will be added to the repository at the next commit. To
180 180 undo an add before that, see :hg:`forget`.
181 181
182 182 If no names are given, add all files to the repository.
183 183
184 184 .. container:: verbose
185 185
186 186 An example showing how new (unknown) files are added
187 187 automatically by :hg:`add`::
188 188
189 189 $ ls
190 190 foo.c
191 191 $ hg status
192 192 ? foo.c
193 193 $ hg add
194 194 adding foo.c
195 195 $ hg status
196 196 A foo.c
197 197
198 198 Returns 0 if all files are successfully added.
199 199 """
200 200
201 201 m = scmutil.match(repo[None], pats, opts)
202 202 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
203 203 return rejected and 1 or 0
204 204
205 205 @command('addremove',
206 206 similarityopts + subrepoopts + walkopts + dryrunopts,
207 207 _('[OPTION]... [FILE]...'),
208 208 inferrepo=True)
209 209 def addremove(ui, repo, *pats, **opts):
210 210 """add all new files, delete all missing files
211 211
212 212 Add all new files and remove all missing files from the
213 213 repository.
214 214
215 215 New files are ignored if they match any of the patterns in
216 216 ``.hgignore``. As with add, these changes take effect at the next
217 217 commit.
218 218
219 219 Use the -s/--similarity option to detect renamed files. This
220 220 option takes a percentage between 0 (disabled) and 100 (files must
221 221 be identical) as its parameter. With a parameter greater than 0,
222 222 this compares every removed file with every added file and records
223 223 those similar enough as renames. Detecting renamed files this way
224 224 can be expensive. After using this option, :hg:`status -C` can be
225 225 used to check which files were identified as moved or renamed. If
226 226 not specified, -s/--similarity defaults to 100 and only renames of
227 227 identical files are detected.
228 228
229 229 Returns 0 if all files are successfully added.
230 230 """
231 231 try:
232 232 sim = float(opts.get('similarity') or 100)
233 233 except ValueError:
234 234 raise util.Abort(_('similarity must be a number'))
235 235 if sim < 0 or sim > 100:
236 236 raise util.Abort(_('similarity must be between 0 and 100'))
237 237 matcher = scmutil.match(repo[None], pats, opts)
238 238 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
239 239
240 240 @command('^annotate|blame',
241 241 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
242 242 ('', 'follow', None,
243 243 _('follow copies/renames and list the filename (DEPRECATED)')),
244 244 ('', 'no-follow', None, _("don't follow copies and renames")),
245 245 ('a', 'text', None, _('treat all files as text')),
246 246 ('u', 'user', None, _('list the author (long with -v)')),
247 247 ('f', 'file', None, _('list the filename')),
248 248 ('d', 'date', None, _('list the date (short with -q)')),
249 249 ('n', 'number', None, _('list the revision number (default)')),
250 250 ('c', 'changeset', None, _('list the changeset')),
251 251 ('l', 'line-number', None, _('show line number at the first appearance'))
252 252 ] + diffwsopts + walkopts + formatteropts,
253 253 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
254 254 inferrepo=True)
255 255 def annotate(ui, repo, *pats, **opts):
256 256 """show changeset information by line for each file
257 257
258 258 List changes in files, showing the revision id responsible for
259 259 each line
260 260
261 261 This command is useful for discovering when a change was made and
262 262 by whom.
263 263
264 264 Without the -a/--text option, annotate will avoid processing files
265 265 it detects as binary. With -a, annotate will annotate the file
266 266 anyway, although the results will probably be neither useful
267 267 nor desirable.
268 268
269 269 Returns 0 on success.
270 270 """
271 271 if not pats:
272 272 raise util.Abort(_('at least one filename or pattern is required'))
273 273
274 274 if opts.get('follow'):
275 275 # --follow is deprecated and now just an alias for -f/--file
276 276 # to mimic the behavior of Mercurial before version 1.5
277 277 opts['file'] = True
278 278
279 279 fm = ui.formatter('annotate', opts)
280 280 datefunc = ui.quiet and util.shortdate or util.datestr
281 281 hexfn = fm.hexfunc
282 282
283 283 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
284 284 ('number', ' ', lambda x: x[0].rev(), str),
285 285 ('changeset', ' ', lambda x: hexfn(x[0].node()), str),
286 286 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
287 287 ('file', ' ', lambda x: x[0].path(), str),
288 288 ('line_number', ':', lambda x: x[1], str),
289 289 ]
290 290 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
291 291
292 292 if (not opts.get('user') and not opts.get('changeset')
293 293 and not opts.get('date') and not opts.get('file')):
294 294 opts['number'] = True
295 295
296 296 linenumber = opts.get('line_number') is not None
297 297 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
298 298 raise util.Abort(_('at least one of -n/-c is required for -l'))
299 299
300 300 if fm:
301 301 def makefunc(get, fmt):
302 302 return get
303 303 else:
304 304 def makefunc(get, fmt):
305 305 return lambda x: fmt(get(x))
306 306 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
307 307 if opts.get(op)]
308 308 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
309 309 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
310 310 if opts.get(op))
311 311
312 312 def bad(x, y):
313 313 raise util.Abort("%s: %s" % (x, y))
314 314
315 315 ctx = scmutil.revsingle(repo, opts.get('rev'))
316 316 m = scmutil.match(ctx, pats, opts)
317 317 m.bad = bad
318 318 follow = not opts.get('no_follow')
319 319 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
320 320 whitespace=True)
321 321 for abs in ctx.walk(m):
322 322 fctx = ctx[abs]
323 323 if not opts.get('text') and util.binary(fctx.data()):
324 324 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
325 325 continue
326 326
327 327 lines = fctx.annotate(follow=follow, linenumber=linenumber,
328 328 diffopts=diffopts)
329 329 formats = []
330 330 pieces = []
331 331
332 332 for f, sep in funcmap:
333 333 l = [f(n) for n, dummy in lines]
334 334 if l:
335 335 if fm:
336 336 formats.append(['%s' for x in l])
337 337 else:
338 338 sizes = [encoding.colwidth(x) for x in l]
339 339 ml = max(sizes)
340 340 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
341 341 pieces.append(l)
342 342
343 343 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
344 344 fm.startitem()
345 345 fm.write(fields, "".join(f), *p)
346 346 fm.write('line', ": %s", l[1])
347 347
348 348 if lines and not lines[-1][1].endswith('\n'):
349 349 fm.plain('\n')
350 350
351 351 fm.end()
352 352
353 353 @command('archive',
354 354 [('', 'no-decode', None, _('do not pass files through decoders')),
355 355 ('p', 'prefix', '', _('directory prefix for files in archive'),
356 356 _('PREFIX')),
357 357 ('r', 'rev', '', _('revision to distribute'), _('REV')),
358 358 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
359 359 ] + subrepoopts + walkopts,
360 360 _('[OPTION]... DEST'))
361 361 def archive(ui, repo, dest, **opts):
362 362 '''create an unversioned archive of a repository revision
363 363
364 364 By default, the revision used is the parent of the working
365 365 directory; use -r/--rev to specify a different revision.
366 366
367 367 The archive type is automatically detected based on file
368 368 extension (or override using -t/--type).
369 369
370 370 .. container:: verbose
371 371
372 372 Examples:
373 373
374 374 - create a zip file containing the 1.0 release::
375 375
376 376 hg archive -r 1.0 project-1.0.zip
377 377
378 378 - create a tarball excluding .hg files::
379 379
380 380 hg archive project.tar.gz -X ".hg*"
381 381
382 382 Valid types are:
383 383
384 384 :``files``: a directory full of files (default)
385 385 :``tar``: tar archive, uncompressed
386 386 :``tbz2``: tar archive, compressed using bzip2
387 387 :``tgz``: tar archive, compressed using gzip
388 388 :``uzip``: zip archive, uncompressed
389 389 :``zip``: zip archive, compressed using deflate
390 390
391 391 The exact name of the destination archive or directory is given
392 392 using a format string; see :hg:`help export` for details.
393 393
394 394 Each member added to an archive file has a directory prefix
395 395 prepended. Use -p/--prefix to specify a format string for the
396 396 prefix. The default is the basename of the archive, with suffixes
397 397 removed.
398 398
399 399 Returns 0 on success.
400 400 '''
401 401
402 402 ctx = scmutil.revsingle(repo, opts.get('rev'))
403 403 if not ctx:
404 404 raise util.Abort(_('no working directory: please specify a revision'))
405 405 node = ctx.node()
406 406 dest = cmdutil.makefilename(repo, dest, node)
407 407 if os.path.realpath(dest) == repo.root:
408 408 raise util.Abort(_('repository root cannot be destination'))
409 409
410 410 kind = opts.get('type') or archival.guesskind(dest) or 'files'
411 411 prefix = opts.get('prefix')
412 412
413 413 if dest == '-':
414 414 if kind == 'files':
415 415 raise util.Abort(_('cannot archive plain files to stdout'))
416 416 dest = cmdutil.makefileobj(repo, dest)
417 417 if not prefix:
418 418 prefix = os.path.basename(repo.root) + '-%h'
419 419
420 420 prefix = cmdutil.makefilename(repo, prefix, node)
421 421 matchfn = scmutil.match(ctx, [], opts)
422 422 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
423 423 matchfn, prefix, subrepos=opts.get('subrepos'))
424 424
425 425 @command('backout',
426 426 [('', 'merge', None, _('merge with old dirstate parent after backout')),
427 427 ('', 'commit', None, _('commit if no conflicts were encountered')),
428 428 ('', 'parent', '',
429 429 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
430 430 ('r', 'rev', '', _('revision to backout'), _('REV')),
431 431 ('e', 'edit', False, _('invoke editor on commit messages')),
432 432 ] + mergetoolopts + walkopts + commitopts + commitopts2,
433 433 _('[OPTION]... [-r] REV'))
434 434 def backout(ui, repo, node=None, rev=None, commit=False, **opts):
435 435 '''reverse effect of earlier changeset
436 436
437 437 Prepare a new changeset with the effect of REV undone in the
438 438 current working directory.
439 439
440 440 If REV is the parent of the working directory, then this new changeset
441 441 is committed automatically. Otherwise, hg needs to merge the
442 442 changes and the merged result is left uncommitted.
443 443
444 444 .. note::
445 445
446 446 backout cannot be used to fix either an unwanted or
447 447 incorrect merge.
448 448
449 449 .. container:: verbose
450 450
451 451 By default, the pending changeset will have one parent,
452 452 maintaining a linear history. With --merge, the pending
453 453 changeset will instead have two parents: the old parent of the
454 454 working directory and a new child of REV that simply undoes REV.
455 455
456 456 Before version 1.7, the behavior without --merge was equivalent
457 457 to specifying --merge followed by :hg:`update --clean .` to
458 458 cancel the merge and leave the child of REV as a head to be
459 459 merged separately.
460 460
461 461 See :hg:`help dates` for a list of formats valid for -d/--date.
462 462
463 463 Returns 0 on success, 1 if nothing to backout or there are unresolved
464 464 files.
465 465 '''
466 466 if rev and node:
467 467 raise util.Abort(_("please specify just one revision"))
468 468
469 469 if not rev:
470 470 rev = node
471 471
472 472 if not rev:
473 473 raise util.Abort(_("please specify a revision to backout"))
474 474
475 475 date = opts.get('date')
476 476 if date:
477 477 opts['date'] = util.parsedate(date)
478 478
479 479 cmdutil.checkunfinished(repo)
480 480 cmdutil.bailifchanged(repo)
481 481 node = scmutil.revsingle(repo, rev).node()
482 482
483 483 op1, op2 = repo.dirstate.parents()
484 484 if not repo.changelog.isancestor(node, op1):
485 485 raise util.Abort(_('cannot backout change that is not an ancestor'))
486 486
487 487 p1, p2 = repo.changelog.parents(node)
488 488 if p1 == nullid:
489 489 raise util.Abort(_('cannot backout a change with no parents'))
490 490 if p2 != nullid:
491 491 if not opts.get('parent'):
492 492 raise util.Abort(_('cannot backout a merge changeset'))
493 493 p = repo.lookup(opts['parent'])
494 494 if p not in (p1, p2):
495 495 raise util.Abort(_('%s is not a parent of %s') %
496 496 (short(p), short(node)))
497 497 parent = p
498 498 else:
499 499 if opts.get('parent'):
500 500 raise util.Abort(_('cannot use --parent on non-merge changeset'))
501 501 parent = p1
502 502
503 503 # the backout should appear on the same branch
504 504 wlock = repo.wlock()
505 505 try:
506 506 branch = repo.dirstate.branch()
507 507 bheads = repo.branchheads(branch)
508 508 rctx = scmutil.revsingle(repo, hex(parent))
509 509 if not opts.get('merge') and op1 != node:
510 510 try:
511 511 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
512 512 'backout')
513 513 repo.dirstate.beginparentchange()
514 514 stats = mergemod.update(repo, parent, True, True, False,
515 515 node, False)
516 516 repo.setparents(op1, op2)
517 517 repo.dirstate.endparentchange()
518 518 hg._showstats(repo, stats)
519 519 if stats[3]:
520 520 repo.ui.status(_("use 'hg resolve' to retry unresolved "
521 521 "file merges\n"))
522 522 return 1
523 523 elif not commit:
524 524 msg = _("changeset %s backed out, "
525 525 "don't forget to commit.\n")
526 526 ui.status(msg % short(node))
527 527 return 0
528 528 finally:
529 529 ui.setconfig('ui', 'forcemerge', '', '')
530 530 else:
531 531 hg.clean(repo, node, show_stats=False)
532 532 repo.dirstate.setbranch(branch)
533 533 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
534 534
535 535
536 536 def commitfunc(ui, repo, message, match, opts):
537 537 editform = 'backout'
538 538 e = cmdutil.getcommiteditor(editform=editform, **opts)
539 539 if not message:
540 540 # we don't translate commit messages
541 541 message = "Backed out changeset %s" % short(node)
542 542 e = cmdutil.getcommiteditor(edit=True, editform=editform)
543 543 return repo.commit(message, opts.get('user'), opts.get('date'),
544 544 match, editor=e)
545 545 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
546 546 if not newnode:
547 547 ui.status(_("nothing changed\n"))
548 548 return 1
549 549 cmdutil.commitstatus(repo, newnode, branch, bheads)
550 550
551 551 def nice(node):
552 552 return '%d:%s' % (repo.changelog.rev(node), short(node))
553 553 ui.status(_('changeset %s backs out changeset %s\n') %
554 554 (nice(repo.changelog.tip()), nice(node)))
555 555 if opts.get('merge') and op1 != node:
556 556 hg.clean(repo, op1, show_stats=False)
557 557 ui.status(_('merging with changeset %s\n')
558 558 % nice(repo.changelog.tip()))
559 559 try:
560 560 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
561 561 'backout')
562 562 return hg.merge(repo, hex(repo.changelog.tip()))
563 563 finally:
564 564 ui.setconfig('ui', 'forcemerge', '', '')
565 565 finally:
566 566 wlock.release()
567 567 return 0
568 568
569 569 @command('bisect',
570 570 [('r', 'reset', False, _('reset bisect state')),
571 571 ('g', 'good', False, _('mark changeset good')),
572 572 ('b', 'bad', False, _('mark changeset bad')),
573 573 ('s', 'skip', False, _('skip testing changeset')),
574 574 ('e', 'extend', False, _('extend the bisect range')),
575 575 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
576 576 ('U', 'noupdate', False, _('do not update to target'))],
577 577 _("[-gbsr] [-U] [-c CMD] [REV]"))
578 578 def bisect(ui, repo, rev=None, extra=None, command=None,
579 579 reset=None, good=None, bad=None, skip=None, extend=None,
580 580 noupdate=None):
581 581 """subdivision search of changesets
582 582
583 583 This command helps to find changesets which introduce problems. To
584 584 use, mark the earliest changeset you know exhibits the problem as
585 585 bad, then mark the latest changeset which is free from the problem
586 586 as good. Bisect will update your working directory to a revision
587 587 for testing (unless the -U/--noupdate option is specified). Once
588 588 you have performed tests, mark the working directory as good or
589 589 bad, and bisect will either update to another candidate changeset
590 590 or announce that it has found the bad revision.
591 591
592 592 As a shortcut, you can also use the revision argument to mark a
593 593 revision as good or bad without checking it out first.
594 594
595 595 If you supply a command, it will be used for automatic bisection.
596 596 The environment variable HG_NODE will contain the ID of the
597 597 changeset being tested. The exit status of the command will be
598 598 used to mark revisions as good or bad: status 0 means good, 125
599 599 means to skip the revision, 127 (command not found) will abort the
600 600 bisection, and any other non-zero exit status means the revision
601 601 is bad.
602 602
603 603 .. container:: verbose
604 604
605 605 Some examples:
606 606
607 607 - start a bisection with known bad revision 34, and good revision 12::
608 608
609 609 hg bisect --bad 34
610 610 hg bisect --good 12
611 611
612 612 - advance the current bisection by marking current revision as good or
613 613 bad::
614 614
615 615 hg bisect --good
616 616 hg bisect --bad
617 617
618 618 - mark the current revision, or a known revision, to be skipped (e.g. if
619 619 that revision is not usable because of another issue)::
620 620
621 621 hg bisect --skip
622 622 hg bisect --skip 23
623 623
624 624 - skip all revisions that do not touch directories ``foo`` or ``bar``::
625 625
626 626 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
627 627
628 628 - forget the current bisection::
629 629
630 630 hg bisect --reset
631 631
632 632 - use 'make && make tests' to automatically find the first broken
633 633 revision::
634 634
635 635 hg bisect --reset
636 636 hg bisect --bad 34
637 637 hg bisect --good 12
638 638 hg bisect --command "make && make tests"
639 639
640 640 - see all changesets whose states are already known in the current
641 641 bisection::
642 642
643 643 hg log -r "bisect(pruned)"
644 644
645 645 - see the changeset currently being bisected (especially useful
646 646 if running with -U/--noupdate)::
647 647
648 648 hg log -r "bisect(current)"
649 649
650 650 - see all changesets that took part in the current bisection::
651 651
652 652 hg log -r "bisect(range)"
653 653
654 654 - you can even get a nice graph::
655 655
656 656 hg log --graph -r "bisect(range)"
657 657
658 658 See :hg:`help revsets` for more about the `bisect()` keyword.
659 659
660 660 Returns 0 on success.
661 661 """
662 662 def extendbisectrange(nodes, good):
663 663 # bisect is incomplete when it ends on a merge node and
664 664 # one of the parent was not checked.
665 665 parents = repo[nodes[0]].parents()
666 666 if len(parents) > 1:
667 667 side = good and state['bad'] or state['good']
668 668 num = len(set(i.node() for i in parents) & set(side))
669 669 if num == 1:
670 670 return parents[0].ancestor(parents[1])
671 671 return None
672 672
673 673 def print_result(nodes, good):
674 674 displayer = cmdutil.show_changeset(ui, repo, {})
675 675 if len(nodes) == 1:
676 676 # narrowed it down to a single revision
677 677 if good:
678 678 ui.write(_("The first good revision is:\n"))
679 679 else:
680 680 ui.write(_("The first bad revision is:\n"))
681 681 displayer.show(repo[nodes[0]])
682 682 extendnode = extendbisectrange(nodes, good)
683 683 if extendnode is not None:
684 684 ui.write(_('Not all ancestors of this changeset have been'
685 685 ' checked.\nUse bisect --extend to continue the '
686 686 'bisection from\nthe common ancestor, %s.\n')
687 687 % extendnode)
688 688 else:
689 689 # multiple possible revisions
690 690 if good:
691 691 ui.write(_("Due to skipped revisions, the first "
692 692 "good revision could be any of:\n"))
693 693 else:
694 694 ui.write(_("Due to skipped revisions, the first "
695 695 "bad revision could be any of:\n"))
696 696 for n in nodes:
697 697 displayer.show(repo[n])
698 698 displayer.close()
699 699
700 700 def check_state(state, interactive=True):
701 701 if not state['good'] or not state['bad']:
702 702 if (good or bad or skip or reset) and interactive:
703 703 return
704 704 if not state['good']:
705 705 raise util.Abort(_('cannot bisect (no known good revisions)'))
706 706 else:
707 707 raise util.Abort(_('cannot bisect (no known bad revisions)'))
708 708 return True
709 709
710 710 # backward compatibility
711 711 if rev in "good bad reset init".split():
712 712 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
713 713 cmd, rev, extra = rev, extra, None
714 714 if cmd == "good":
715 715 good = True
716 716 elif cmd == "bad":
717 717 bad = True
718 718 else:
719 719 reset = True
720 720 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
721 721 raise util.Abort(_('incompatible arguments'))
722 722
723 723 cmdutil.checkunfinished(repo)
724 724
725 725 if reset:
726 726 p = repo.join("bisect.state")
727 727 if os.path.exists(p):
728 728 os.unlink(p)
729 729 return
730 730
731 731 state = hbisect.load_state(repo)
732 732
733 733 if command:
734 734 changesets = 1
735 735 if noupdate:
736 736 try:
737 737 node = state['current'][0]
738 738 except LookupError:
739 739 raise util.Abort(_('current bisect revision is unknown - '
740 740 'start a new bisect to fix'))
741 741 else:
742 742 node, p2 = repo.dirstate.parents()
743 743 if p2 != nullid:
744 744 raise util.Abort(_('current bisect revision is a merge'))
745 745 try:
746 746 while changesets:
747 747 # update state
748 748 state['current'] = [node]
749 749 hbisect.save_state(repo, state)
750 750 status = ui.system(command, environ={'HG_NODE': hex(node)})
751 751 if status == 125:
752 752 transition = "skip"
753 753 elif status == 0:
754 754 transition = "good"
755 755 # status < 0 means process was killed
756 756 elif status == 127:
757 757 raise util.Abort(_("failed to execute %s") % command)
758 758 elif status < 0:
759 759 raise util.Abort(_("%s killed") % command)
760 760 else:
761 761 transition = "bad"
762 762 ctx = scmutil.revsingle(repo, rev, node)
763 763 rev = None # clear for future iterations
764 764 state[transition].append(ctx.node())
765 765 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
766 766 check_state(state, interactive=False)
767 767 # bisect
768 768 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
769 769 # update to next check
770 770 node = nodes[0]
771 771 if not noupdate:
772 772 cmdutil.bailifchanged(repo)
773 773 hg.clean(repo, node, show_stats=False)
774 774 finally:
775 775 state['current'] = [node]
776 776 hbisect.save_state(repo, state)
777 777 print_result(nodes, bgood)
778 778 return
779 779
780 780 # update state
781 781
782 782 if rev:
783 783 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
784 784 else:
785 785 nodes = [repo.lookup('.')]
786 786
787 787 if good or bad or skip:
788 788 if good:
789 789 state['good'] += nodes
790 790 elif bad:
791 791 state['bad'] += nodes
792 792 elif skip:
793 793 state['skip'] += nodes
794 794 hbisect.save_state(repo, state)
795 795
796 796 if not check_state(state):
797 797 return
798 798
799 799 # actually bisect
800 800 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
801 801 if extend:
802 802 if not changesets:
803 803 extendnode = extendbisectrange(nodes, good)
804 804 if extendnode is not None:
805 805 ui.write(_("Extending search to changeset %d:%s\n")
806 806 % (extendnode.rev(), extendnode))
807 807 state['current'] = [extendnode.node()]
808 808 hbisect.save_state(repo, state)
809 809 if noupdate:
810 810 return
811 811 cmdutil.bailifchanged(repo)
812 812 return hg.clean(repo, extendnode.node())
813 813 raise util.Abort(_("nothing to extend"))
814 814
815 815 if changesets == 0:
816 816 print_result(nodes, good)
817 817 else:
818 818 assert len(nodes) == 1 # only a single node can be tested next
819 819 node = nodes[0]
820 820 # compute the approximate number of remaining tests
821 821 tests, size = 0, 2
822 822 while size <= changesets:
823 823 tests, size = tests + 1, size * 2
824 824 rev = repo.changelog.rev(node)
825 825 ui.write(_("Testing changeset %d:%s "
826 826 "(%d changesets remaining, ~%d tests)\n")
827 827 % (rev, short(node), changesets, tests))
828 828 state['current'] = [node]
829 829 hbisect.save_state(repo, state)
830 830 if not noupdate:
831 831 cmdutil.bailifchanged(repo)
832 832 return hg.clean(repo, node)
833 833
834 834 @command('bookmarks|bookmark',
835 835 [('f', 'force', False, _('force')),
836 836 ('r', 'rev', '', _('revision'), _('REV')),
837 837 ('d', 'delete', False, _('delete a given bookmark')),
838 838 ('m', 'rename', '', _('rename a given bookmark'), _('NAME')),
839 839 ('i', 'inactive', False, _('mark a bookmark inactive')),
840 840 ] + formatteropts,
841 841 _('hg bookmarks [OPTIONS]... [NAME]...'))
842 842 def bookmark(ui, repo, *names, **opts):
843 843 '''create a new bookmark or list existing bookmarks
844 844
845 845 Bookmarks are labels on changesets to help track lines of development.
846 846 Bookmarks are unversioned and can be moved, renamed and deleted.
847 847 Deleting or moving a bookmark has no effect on the associated changesets.
848 848
849 849 Creating or updating to a bookmark causes it to be marked as 'active'.
850 850 The active bookmark is indicated with a '*'.
851 851 When a commit is made, the active bookmark will advance to the new commit.
852 852 A plain :hg:`update` will also advance an active bookmark, if possible.
853 853 Updating away from a bookmark will cause it to be deactivated.
854 854
855 855 Bookmarks can be pushed and pulled between repositories (see
856 856 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
857 857 diverged, a new 'divergent bookmark' of the form 'name@path' will
858 858 be created. Using :hg:`merge` will resolve the divergence.
859 859
860 860 A bookmark named '@' has the special property that :hg:`clone` will
861 861 check it out by default if it exists.
862 862
863 863 .. container:: verbose
864 864
865 865 Examples:
866 866
867 867 - create an active bookmark for a new line of development::
868 868
869 869 hg book new-feature
870 870
871 871 - create an inactive bookmark as a place marker::
872 872
873 873 hg book -i reviewed
874 874
875 875 - create an inactive bookmark on another changeset::
876 876
877 877 hg book -r .^ tested
878 878
879 879 - move the '@' bookmark from another branch::
880 880
881 881 hg book -f @
882 882 '''
883 883 force = opts.get('force')
884 884 rev = opts.get('rev')
885 885 delete = opts.get('delete')
886 886 rename = opts.get('rename')
887 887 inactive = opts.get('inactive')
888 888
889 889 def checkformat(mark):
890 890 mark = mark.strip()
891 891 if not mark:
892 892 raise util.Abort(_("bookmark names cannot consist entirely of "
893 893 "whitespace"))
894 894 scmutil.checknewlabel(repo, mark, 'bookmark')
895 895 return mark
896 896
897 897 def checkconflict(repo, mark, cur, force=False, target=None):
898 898 if mark in marks and not force:
899 899 if target:
900 900 if marks[mark] == target and target == cur:
901 901 # re-activating a bookmark
902 902 return
903 903 anc = repo.changelog.ancestors([repo[target].rev()])
904 904 bmctx = repo[marks[mark]]
905 905 divs = [repo[b].node() for b in marks
906 906 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
907 907
908 908 # allow resolving a single divergent bookmark even if moving
909 909 # the bookmark across branches when a revision is specified
910 910 # that contains a divergent bookmark
911 911 if bmctx.rev() not in anc and target in divs:
912 912 bookmarks.deletedivergent(repo, [target], mark)
913 913 return
914 914
915 915 deletefrom = [b for b in divs
916 916 if repo[b].rev() in anc or b == target]
917 917 bookmarks.deletedivergent(repo, deletefrom, mark)
918 918 if bookmarks.validdest(repo, bmctx, repo[target]):
919 919 ui.status(_("moving bookmark '%s' forward from %s\n") %
920 920 (mark, short(bmctx.node())))
921 921 return
922 922 raise util.Abort(_("bookmark '%s' already exists "
923 923 "(use -f to force)") % mark)
924 924 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
925 925 and not force):
926 926 raise util.Abort(
927 927 _("a bookmark cannot have the name of an existing branch"))
928 928
929 929 if delete and rename:
930 930 raise util.Abort(_("--delete and --rename are incompatible"))
931 931 if delete and rev:
932 932 raise util.Abort(_("--rev is incompatible with --delete"))
933 933 if rename and rev:
934 934 raise util.Abort(_("--rev is incompatible with --rename"))
935 935 if not names and (delete or rev):
936 936 raise util.Abort(_("bookmark name required"))
937 937
938 938 if delete or rename or names or inactive:
939 939 wlock = repo.wlock()
940 940 try:
941 941 cur = repo.changectx('.').node()
942 942 marks = repo._bookmarks
943 943 if delete:
944 944 for mark in names:
945 945 if mark not in marks:
946 946 raise util.Abort(_("bookmark '%s' does not exist") %
947 947 mark)
948 948 if mark == repo._bookmarkcurrent:
949 949 bookmarks.unsetcurrent(repo)
950 950 del marks[mark]
951 951 marks.write()
952 952
953 953 elif rename:
954 954 if not names:
955 955 raise util.Abort(_("new bookmark name required"))
956 956 elif len(names) > 1:
957 957 raise util.Abort(_("only one new bookmark name allowed"))
958 958 mark = checkformat(names[0])
959 959 if rename not in marks:
960 960 raise util.Abort(_("bookmark '%s' does not exist") % rename)
961 961 checkconflict(repo, mark, cur, force)
962 962 marks[mark] = marks[rename]
963 963 if repo._bookmarkcurrent == rename and not inactive:
964 964 bookmarks.setcurrent(repo, mark)
965 965 del marks[rename]
966 966 marks.write()
967 967
968 968 elif names:
969 969 newact = None
970 970 for mark in names:
971 971 mark = checkformat(mark)
972 972 if newact is None:
973 973 newact = mark
974 974 if inactive and mark == repo._bookmarkcurrent:
975 975 bookmarks.unsetcurrent(repo)
976 976 return
977 977 tgt = cur
978 978 if rev:
979 979 tgt = scmutil.revsingle(repo, rev).node()
980 980 checkconflict(repo, mark, cur, force, tgt)
981 981 marks[mark] = tgt
982 982 if not inactive and cur == marks[newact] and not rev:
983 983 bookmarks.setcurrent(repo, newact)
984 984 elif cur != tgt and newact == repo._bookmarkcurrent:
985 985 bookmarks.unsetcurrent(repo)
986 986 marks.write()
987 987
988 988 elif inactive:
989 989 if len(marks) == 0:
990 990 ui.status(_("no bookmarks set\n"))
991 991 elif not repo._bookmarkcurrent:
992 992 ui.status(_("no active bookmark\n"))
993 993 else:
994 994 bookmarks.unsetcurrent(repo)
995 995 finally:
996 996 wlock.release()
997 997 else: # show bookmarks
998 998 fm = ui.formatter('bookmarks', opts)
999 999 hexfn = fm.hexfunc
1000 1000 marks = repo._bookmarks
1001 1001 if len(marks) == 0 and not fm:
1002 1002 ui.status(_("no bookmarks set\n"))
1003 1003 for bmark, n in sorted(marks.iteritems()):
1004 1004 current = repo._bookmarkcurrent
1005 1005 if bmark == current:
1006 1006 prefix, label = '*', 'bookmarks.current'
1007 1007 else:
1008 1008 prefix, label = ' ', ''
1009 1009
1010 1010 fm.startitem()
1011 1011 if not ui.quiet:
1012 1012 fm.plain(' %s ' % prefix, label=label)
1013 1013 fm.write('bookmark', '%s', bmark, label=label)
1014 1014 pad = " " * (25 - encoding.colwidth(bmark))
1015 1015 fm.condwrite(not ui.quiet, 'rev node', pad + ' %d:%s',
1016 1016 repo.changelog.rev(n), hexfn(n), label=label)
1017 1017 fm.data(active=(bmark == current))
1018 1018 fm.plain('\n')
1019 1019 fm.end()
1020 1020
1021 1021 @command('branch',
1022 1022 [('f', 'force', None,
1023 1023 _('set branch name even if it shadows an existing branch')),
1024 1024 ('C', 'clean', None, _('reset branch name to parent branch name'))],
1025 1025 _('[-fC] [NAME]'))
1026 1026 def branch(ui, repo, label=None, **opts):
1027 1027 """set or show the current branch name
1028 1028
1029 1029 .. note::
1030 1030
1031 1031 Branch names are permanent and global. Use :hg:`bookmark` to create a
1032 1032 light-weight bookmark instead. See :hg:`help glossary` for more
1033 1033 information about named branches and bookmarks.
1034 1034
1035 1035 With no argument, show the current branch name. With one argument,
1036 1036 set the working directory branch name (the branch will not exist
1037 1037 in the repository until the next commit). Standard practice
1038 1038 recommends that primary development take place on the 'default'
1039 1039 branch.
1040 1040
1041 1041 Unless -f/--force is specified, branch will not let you set a
1042 1042 branch name that already exists.
1043 1043
1044 1044 Use -C/--clean to reset the working directory branch to that of
1045 1045 the parent of the working directory, negating a previous branch
1046 1046 change.
1047 1047
1048 1048 Use the command :hg:`update` to switch to an existing branch. Use
1049 1049 :hg:`commit --close-branch` to mark this branch as closed.
1050 1050
1051 1051 Returns 0 on success.
1052 1052 """
1053 1053 if label:
1054 1054 label = label.strip()
1055 1055
1056 1056 if not opts.get('clean') and not label:
1057 1057 ui.write("%s\n" % repo.dirstate.branch())
1058 1058 return
1059 1059
1060 1060 wlock = repo.wlock()
1061 1061 try:
1062 1062 if opts.get('clean'):
1063 1063 label = repo[None].p1().branch()
1064 1064 repo.dirstate.setbranch(label)
1065 1065 ui.status(_('reset working directory to branch %s\n') % label)
1066 1066 elif label:
1067 1067 if not opts.get('force') and label in repo.branchmap():
1068 1068 if label not in [p.branch() for p in repo.parents()]:
1069 1069 raise util.Abort(_('a branch of the same name already'
1070 1070 ' exists'),
1071 1071 # i18n: "it" refers to an existing branch
1072 1072 hint=_("use 'hg update' to switch to it"))
1073 1073 scmutil.checknewlabel(repo, label, 'branch')
1074 1074 repo.dirstate.setbranch(label)
1075 1075 ui.status(_('marked working directory as branch %s\n') % label)
1076 1076 ui.status(_('(branches are permanent and global, '
1077 1077 'did you want a bookmark?)\n'))
1078 1078 finally:
1079 1079 wlock.release()
1080 1080
1081 1081 @command('branches',
1082 1082 [('a', 'active', False,
1083 1083 _('show only branches that have unmerged heads (DEPRECATED)')),
1084 1084 ('c', 'closed', False, _('show normal and closed branches')),
1085 1085 ] + formatteropts,
1086 1086 _('[-ac]'))
1087 1087 def branches(ui, repo, active=False, closed=False, **opts):
1088 1088 """list repository named branches
1089 1089
1090 1090 List the repository's named branches, indicating which ones are
1091 1091 inactive. If -c/--closed is specified, also list branches which have
1092 1092 been marked closed (see :hg:`commit --close-branch`).
1093 1093
1094 1094 Use the command :hg:`update` to switch to an existing branch.
1095 1095
1096 1096 Returns 0.
1097 1097 """
1098 1098
1099 1099 fm = ui.formatter('branches', opts)
1100 1100 hexfunc = fm.hexfunc
1101 1101
1102 1102 allheads = set(repo.heads())
1103 1103 branches = []
1104 1104 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1105 1105 isactive = not isclosed and bool(set(heads) & allheads)
1106 1106 branches.append((tag, repo[tip], isactive, not isclosed))
1107 1107 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1108 1108 reverse=True)
1109 1109
1110 1110 for tag, ctx, isactive, isopen in branches:
1111 1111 if active and not isactive:
1112 1112 continue
1113 1113 if isactive:
1114 1114 label = 'branches.active'
1115 1115 notice = ''
1116 1116 elif not isopen:
1117 1117 if not closed:
1118 1118 continue
1119 1119 label = 'branches.closed'
1120 1120 notice = _(' (closed)')
1121 1121 else:
1122 1122 label = 'branches.inactive'
1123 1123 notice = _(' (inactive)')
1124 1124 current = (tag == repo.dirstate.branch())
1125 1125 if current:
1126 1126 label = 'branches.current'
1127 1127
1128 1128 fm.startitem()
1129 1129 fm.write('branch', '%s', tag, label=label)
1130 1130 rev = ctx.rev()
1131 1131 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1132 1132 fmt = ' ' * padsize + ' %d:%s'
1133 1133 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1134 1134 label='log.changeset changeset.%s' % ctx.phasestr())
1135 1135 fm.data(active=isactive, closed=not isopen, current=current)
1136 1136 if not ui.quiet:
1137 1137 fm.plain(notice)
1138 1138 fm.plain('\n')
1139 1139 fm.end()
1140 1140
1141 1141 @command('bundle',
1142 1142 [('f', 'force', None, _('run even when the destination is unrelated')),
1143 1143 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1144 1144 _('REV')),
1145 1145 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1146 1146 _('BRANCH')),
1147 1147 ('', 'base', [],
1148 1148 _('a base changeset assumed to be available at the destination'),
1149 1149 _('REV')),
1150 1150 ('a', 'all', None, _('bundle all changesets in the repository')),
1151 1151 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1152 1152 ] + remoteopts,
1153 1153 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1154 1154 def bundle(ui, repo, fname, dest=None, **opts):
1155 1155 """create a changegroup file
1156 1156
1157 1157 Generate a compressed changegroup file collecting changesets not
1158 1158 known to be in another repository.
1159 1159
1160 1160 If you omit the destination repository, then hg assumes the
1161 1161 destination will have all the nodes you specify with --base
1162 1162 parameters. To create a bundle containing all changesets, use
1163 1163 -a/--all (or --base null).
1164 1164
1165 1165 You can change compression method with the -t/--type option.
1166 1166 The available compression methods are: none, bzip2, and
1167 1167 gzip (by default, bundles are compressed using bzip2).
1168 1168
1169 1169 The bundle file can then be transferred using conventional means
1170 1170 and applied to another repository with the unbundle or pull
1171 1171 command. This is useful when direct push and pull are not
1172 1172 available or when exporting an entire repository is undesirable.
1173 1173
1174 1174 Applying bundles preserves all changeset contents including
1175 1175 permissions, copy/rename information, and revision history.
1176 1176
1177 1177 Returns 0 on success, 1 if no changes found.
1178 1178 """
1179 1179 revs = None
1180 1180 if 'rev' in opts:
1181 1181 revs = scmutil.revrange(repo, opts['rev'])
1182 1182
1183 1183 bundletype = opts.get('type', 'bzip2').lower()
1184 1184 btypes = {'none': 'HG10UN',
1185 1185 'bzip2': 'HG10BZ',
1186 1186 'gzip': 'HG10GZ',
1187 1187 'bundle2': 'HG2Y'}
1188 1188 bundletype = btypes.get(bundletype)
1189 1189 if bundletype not in changegroup.bundletypes:
1190 1190 raise util.Abort(_('unknown bundle type specified with --type'))
1191 1191
1192 1192 if opts.get('all'):
1193 1193 base = ['null']
1194 1194 else:
1195 1195 base = scmutil.revrange(repo, opts.get('base'))
1196 1196 # TODO: get desired bundlecaps from command line.
1197 1197 bundlecaps = None
1198 1198 if base:
1199 1199 if dest:
1200 1200 raise util.Abort(_("--base is incompatible with specifying "
1201 1201 "a destination"))
1202 1202 common = [repo.lookup(rev) for rev in base]
1203 1203 heads = revs and map(repo.lookup, revs) or revs
1204 1204 cg = changegroup.getchangegroup(repo, 'bundle', heads=heads,
1205 1205 common=common, bundlecaps=bundlecaps)
1206 1206 outgoing = None
1207 1207 else:
1208 1208 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1209 1209 dest, branches = hg.parseurl(dest, opts.get('branch'))
1210 1210 other = hg.peer(repo, opts, dest)
1211 1211 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1212 1212 heads = revs and map(repo.lookup, revs) or revs
1213 1213 outgoing = discovery.findcommonoutgoing(repo, other,
1214 1214 onlyheads=heads,
1215 1215 force=opts.get('force'),
1216 1216 portable=True)
1217 1217 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1218 1218 bundlecaps)
1219 1219 if not cg:
1220 1220 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1221 1221 return 1
1222 1222
1223 1223 changegroup.writebundle(ui, cg, fname, bundletype)
1224 1224
1225 1225 @command('cat',
1226 1226 [('o', 'output', '',
1227 1227 _('print output to file with formatted name'), _('FORMAT')),
1228 1228 ('r', 'rev', '', _('print the given revision'), _('REV')),
1229 1229 ('', 'decode', None, _('apply any matching decode filter')),
1230 1230 ] + walkopts,
1231 1231 _('[OPTION]... FILE...'),
1232 1232 inferrepo=True)
1233 1233 def cat(ui, repo, file1, *pats, **opts):
1234 1234 """output the current or given revision of files
1235 1235
1236 1236 Print the specified files as they were at the given revision. If
1237 1237 no revision is given, the parent of the working directory is used.
1238 1238
1239 1239 Output may be to a file, in which case the name of the file is
1240 1240 given using a format string. The formatting rules as follows:
1241 1241
1242 1242 :``%%``: literal "%" character
1243 1243 :``%s``: basename of file being printed
1244 1244 :``%d``: dirname of file being printed, or '.' if in repository root
1245 1245 :``%p``: root-relative path name of file being printed
1246 1246 :``%H``: changeset hash (40 hexadecimal digits)
1247 1247 :``%R``: changeset revision number
1248 1248 :``%h``: short-form changeset hash (12 hexadecimal digits)
1249 1249 :``%r``: zero-padded changeset revision number
1250 1250 :``%b``: basename of the exporting repository
1251 1251
1252 1252 Returns 0 on success.
1253 1253 """
1254 1254 ctx = scmutil.revsingle(repo, opts.get('rev'))
1255 1255 m = scmutil.match(ctx, (file1,) + pats, opts)
1256 1256
1257 1257 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
1258 1258
1259 1259 @command('^clone',
1260 1260 [('U', 'noupdate', None,
1261 1261 _('the clone will include an empty working copy (only a repository)')),
1262 1262 ('u', 'updaterev', '', _('revision, tag or branch to check out'), _('REV')),
1263 1263 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1264 1264 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1265 1265 ('', 'pull', None, _('use pull protocol to copy metadata')),
1266 1266 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1267 1267 ] + remoteopts,
1268 1268 _('[OPTION]... SOURCE [DEST]'),
1269 1269 norepo=True)
1270 1270 def clone(ui, source, dest=None, **opts):
1271 1271 """make a copy of an existing repository
1272 1272
1273 1273 Create a copy of an existing repository in a new directory.
1274 1274
1275 1275 If no destination directory name is specified, it defaults to the
1276 1276 basename of the source.
1277 1277
1278 1278 The location of the source is added to the new repository's
1279 1279 ``.hg/hgrc`` file, as the default to be used for future pulls.
1280 1280
1281 1281 Only local paths and ``ssh://`` URLs are supported as
1282 1282 destinations. For ``ssh://`` destinations, no working directory or
1283 1283 ``.hg/hgrc`` will be created on the remote side.
1284 1284
1285 1285 To pull only a subset of changesets, specify one or more revisions
1286 1286 identifiers with -r/--rev or branches with -b/--branch. The
1287 1287 resulting clone will contain only the specified changesets and
1288 1288 their ancestors. These options (or 'clone src#rev dest') imply
1289 1289 --pull, even for local source repositories. Note that specifying a
1290 1290 tag will include the tagged changeset but not the changeset
1291 1291 containing the tag.
1292 1292
1293 1293 If the source repository has a bookmark called '@' set, that
1294 1294 revision will be checked out in the new repository by default.
1295 1295
1296 1296 To check out a particular version, use -u/--update, or
1297 1297 -U/--noupdate to create a clone with no working directory.
1298 1298
1299 1299 .. container:: verbose
1300 1300
1301 1301 For efficiency, hardlinks are used for cloning whenever the
1302 1302 source and destination are on the same filesystem (note this
1303 1303 applies only to the repository data, not to the working
1304 1304 directory). Some filesystems, such as AFS, implement hardlinking
1305 1305 incorrectly, but do not report errors. In these cases, use the
1306 1306 --pull option to avoid hardlinking.
1307 1307
1308 1308 In some cases, you can clone repositories and the working
1309 1309 directory using full hardlinks with ::
1310 1310
1311 1311 $ cp -al REPO REPOCLONE
1312 1312
1313 1313 This is the fastest way to clone, but it is not always safe. The
1314 1314 operation is not atomic (making sure REPO is not modified during
1315 1315 the operation is up to you) and you have to make sure your
1316 1316 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1317 1317 so). Also, this is not compatible with certain extensions that
1318 1318 place their metadata under the .hg directory, such as mq.
1319 1319
1320 1320 Mercurial will update the working directory to the first applicable
1321 1321 revision from this list:
1322 1322
1323 1323 a) null if -U or the source repository has no changesets
1324 1324 b) if -u . and the source repository is local, the first parent of
1325 1325 the source repository's working directory
1326 1326 c) the changeset specified with -u (if a branch name, this means the
1327 1327 latest head of that branch)
1328 1328 d) the changeset specified with -r
1329 1329 e) the tipmost head specified with -b
1330 1330 f) the tipmost head specified with the url#branch source syntax
1331 1331 g) the revision marked with the '@' bookmark, if present
1332 1332 h) the tipmost head of the default branch
1333 1333 i) tip
1334 1334
1335 1335 Examples:
1336 1336
1337 1337 - clone a remote repository to a new directory named hg/::
1338 1338
1339 1339 hg clone http://selenic.com/hg
1340 1340
1341 1341 - create a lightweight local clone::
1342 1342
1343 1343 hg clone project/ project-feature/
1344 1344
1345 1345 - clone from an absolute path on an ssh server (note double-slash)::
1346 1346
1347 1347 hg clone ssh://user@server//home/projects/alpha/
1348 1348
1349 1349 - do a high-speed clone over a LAN while checking out a
1350 1350 specified version::
1351 1351
1352 1352 hg clone --uncompressed http://server/repo -u 1.5
1353 1353
1354 1354 - create a repository without changesets after a particular revision::
1355 1355
1356 1356 hg clone -r 04e544 experimental/ good/
1357 1357
1358 1358 - clone (and track) a particular named branch::
1359 1359
1360 1360 hg clone http://selenic.com/hg#stable
1361 1361
1362 1362 See :hg:`help urls` for details on specifying URLs.
1363 1363
1364 1364 Returns 0 on success.
1365 1365 """
1366 1366 if opts.get('noupdate') and opts.get('updaterev'):
1367 1367 raise util.Abort(_("cannot specify both --noupdate and --updaterev"))
1368 1368
1369 1369 r = hg.clone(ui, opts, source, dest,
1370 1370 pull=opts.get('pull'),
1371 1371 stream=opts.get('uncompressed'),
1372 1372 rev=opts.get('rev'),
1373 1373 update=opts.get('updaterev') or not opts.get('noupdate'),
1374 1374 branch=opts.get('branch'))
1375 1375
1376 1376 return r is None
1377 1377
1378 1378 @command('^commit|ci',
1379 1379 [('A', 'addremove', None,
1380 1380 _('mark new/missing files as added/removed before committing')),
1381 1381 ('', 'close-branch', None,
1382 1382 _('mark a branch as closed, hiding it from the branch list')),
1383 1383 ('', 'amend', None, _('amend the parent of the working dir')),
1384 1384 ('s', 'secret', None, _('use the secret phase for committing')),
1385 1385 ('e', 'edit', None, _('invoke editor on commit messages')),
1386 1386 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1387 1387 _('[OPTION]... [FILE]...'),
1388 1388 inferrepo=True)
1389 1389 def commit(ui, repo, *pats, **opts):
1390 1390 """commit the specified files or all outstanding changes
1391 1391
1392 1392 Commit changes to the given files into the repository. Unlike a
1393 1393 centralized SCM, this operation is a local operation. See
1394 1394 :hg:`push` for a way to actively distribute your changes.
1395 1395
1396 1396 If a list of files is omitted, all changes reported by :hg:`status`
1397 1397 will be committed.
1398 1398
1399 1399 If you are committing the result of a merge, do not provide any
1400 1400 filenames or -I/-X filters.
1401 1401
1402 1402 If no commit message is specified, Mercurial starts your
1403 1403 configured editor where you can enter a message. In case your
1404 1404 commit fails, you will find a backup of your message in
1405 1405 ``.hg/last-message.txt``.
1406 1406
1407 1407 The --amend flag can be used to amend the parent of the
1408 1408 working directory with a new commit that contains the changes
1409 1409 in the parent in addition to those currently reported by :hg:`status`,
1410 1410 if there are any. The old commit is stored in a backup bundle in
1411 1411 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1412 1412 on how to restore it).
1413 1413
1414 1414 Message, user and date are taken from the amended commit unless
1415 1415 specified. When a message isn't specified on the command line,
1416 1416 the editor will open with the message of the amended commit.
1417 1417
1418 1418 It is not possible to amend public changesets (see :hg:`help phases`)
1419 1419 or changesets that have children.
1420 1420
1421 1421 See :hg:`help dates` for a list of formats valid for -d/--date.
1422 1422
1423 1423 Returns 0 on success, 1 if nothing changed.
1424 1424 """
1425 1425 if opts.get('subrepos'):
1426 1426 if opts.get('amend'):
1427 1427 raise util.Abort(_('cannot amend with --subrepos'))
1428 1428 # Let --subrepos on the command line override config setting.
1429 1429 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1430 1430
1431 1431 cmdutil.checkunfinished(repo, commit=True)
1432 1432
1433 1433 branch = repo[None].branch()
1434 1434 bheads = repo.branchheads(branch)
1435 1435
1436 1436 extra = {}
1437 1437 if opts.get('close_branch'):
1438 1438 extra['close'] = 1
1439 1439
1440 1440 if not bheads:
1441 1441 raise util.Abort(_('can only close branch heads'))
1442 1442 elif opts.get('amend'):
1443 1443 if repo.parents()[0].p1().branch() != branch and \
1444 1444 repo.parents()[0].p2().branch() != branch:
1445 1445 raise util.Abort(_('can only close branch heads'))
1446 1446
1447 1447 if opts.get('amend'):
1448 1448 if ui.configbool('ui', 'commitsubrepos'):
1449 1449 raise util.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1450 1450
1451 1451 old = repo['.']
1452 1452 if not old.mutable():
1453 1453 raise util.Abort(_('cannot amend public changesets'))
1454 1454 if len(repo[None].parents()) > 1:
1455 1455 raise util.Abort(_('cannot amend while merging'))
1456 1456 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1457 1457 if not allowunstable and old.children():
1458 1458 raise util.Abort(_('cannot amend changeset with children'))
1459 1459
1460 1460 # commitfunc is used only for temporary amend commit by cmdutil.amend
1461 1461 def commitfunc(ui, repo, message, match, opts):
1462 1462 return repo.commit(message,
1463 1463 opts.get('user') or old.user(),
1464 1464 opts.get('date') or old.date(),
1465 1465 match,
1466 1466 extra=extra)
1467 1467
1468 1468 current = repo._bookmarkcurrent
1469 1469 marks = old.bookmarks()
1470 1470 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1471 1471 if node == old.node():
1472 1472 ui.status(_("nothing changed\n"))
1473 1473 return 1
1474 1474 elif marks:
1475 1475 ui.debug('moving bookmarks %r from %s to %s\n' %
1476 1476 (marks, old.hex(), hex(node)))
1477 1477 newmarks = repo._bookmarks
1478 1478 for bm in marks:
1479 1479 newmarks[bm] = node
1480 1480 if bm == current:
1481 1481 bookmarks.setcurrent(repo, bm)
1482 1482 newmarks.write()
1483 1483 else:
1484 1484 def commitfunc(ui, repo, message, match, opts):
1485 1485 backup = ui.backupconfig('phases', 'new-commit')
1486 1486 baseui = repo.baseui
1487 1487 basebackup = baseui.backupconfig('phases', 'new-commit')
1488 1488 try:
1489 1489 if opts.get('secret'):
1490 1490 ui.setconfig('phases', 'new-commit', 'secret', 'commit')
1491 1491 # Propagate to subrepos
1492 1492 baseui.setconfig('phases', 'new-commit', 'secret', 'commit')
1493 1493
1494 1494 editform = cmdutil.mergeeditform(repo[None], 'commit.normal')
1495 1495 editor = cmdutil.getcommiteditor(editform=editform, **opts)
1496 1496 return repo.commit(message, opts.get('user'), opts.get('date'),
1497 1497 match,
1498 1498 editor=editor,
1499 1499 extra=extra)
1500 1500 finally:
1501 1501 ui.restoreconfig(backup)
1502 1502 repo.baseui.restoreconfig(basebackup)
1503 1503
1504 1504
1505 1505 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1506 1506
1507 1507 if not node:
1508 1508 stat = repo.status(match=scmutil.match(repo[None], pats, opts))
1509 1509 if stat[3]:
1510 1510 ui.status(_("nothing changed (%d missing files, see "
1511 1511 "'hg status')\n") % len(stat[3]))
1512 1512 else:
1513 1513 ui.status(_("nothing changed\n"))
1514 1514 return 1
1515 1515
1516 1516 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1517 1517
1518 1518 @command('config|showconfig|debugconfig',
1519 1519 [('u', 'untrusted', None, _('show untrusted configuration options')),
1520 1520 ('e', 'edit', None, _('edit user config')),
1521 1521 ('l', 'local', None, _('edit repository config')),
1522 1522 ('g', 'global', None, _('edit global config'))],
1523 1523 _('[-u] [NAME]...'),
1524 1524 optionalrepo=True)
1525 1525 def config(ui, repo, *values, **opts):
1526 1526 """show combined config settings from all hgrc files
1527 1527
1528 1528 With no arguments, print names and values of all config items.
1529 1529
1530 1530 With one argument of the form section.name, print just the value
1531 1531 of that config item.
1532 1532
1533 1533 With multiple arguments, print names and values of all config
1534 1534 items with matching section names.
1535 1535
1536 1536 With --edit, start an editor on the user-level config file. With
1537 1537 --global, edit the system-wide config file. With --local, edit the
1538 1538 repository-level config file.
1539 1539
1540 1540 With --debug, the source (filename and line number) is printed
1541 1541 for each config item.
1542 1542
1543 1543 See :hg:`help config` for more information about config files.
1544 1544
1545 1545 Returns 0 on success, 1 if NAME does not exist.
1546 1546
1547 1547 """
1548 1548
1549 1549 if opts.get('edit') or opts.get('local') or opts.get('global'):
1550 1550 if opts.get('local') and opts.get('global'):
1551 1551 raise util.Abort(_("can't use --local and --global together"))
1552 1552
1553 1553 if opts.get('local'):
1554 1554 if not repo:
1555 1555 raise util.Abort(_("can't use --local outside a repository"))
1556 1556 paths = [repo.join('hgrc')]
1557 1557 elif opts.get('global'):
1558 1558 paths = scmutil.systemrcpath()
1559 1559 else:
1560 1560 paths = scmutil.userrcpath()
1561 1561
1562 1562 for f in paths:
1563 1563 if os.path.exists(f):
1564 1564 break
1565 1565 else:
1566 1566 if opts.get('global'):
1567 1567 samplehgrc = uimod.samplehgrcs['global']
1568 1568 elif opts.get('local'):
1569 1569 samplehgrc = uimod.samplehgrcs['local']
1570 1570 else:
1571 1571 samplehgrc = uimod.samplehgrcs['user']
1572 1572
1573 1573 f = paths[0]
1574 1574 fp = open(f, "w")
1575 1575 fp.write(samplehgrc)
1576 1576 fp.close()
1577 1577
1578 1578 editor = ui.geteditor()
1579 1579 ui.system("%s \"%s\"" % (editor, f),
1580 1580 onerr=util.Abort, errprefix=_("edit failed"))
1581 1581 return
1582 1582
1583 1583 for f in scmutil.rcpath():
1584 1584 ui.debug('read config from: %s\n' % f)
1585 1585 untrusted = bool(opts.get('untrusted'))
1586 1586 if values:
1587 1587 sections = [v for v in values if '.' not in v]
1588 1588 items = [v for v in values if '.' in v]
1589 1589 if len(items) > 1 or items and sections:
1590 1590 raise util.Abort(_('only one config item permitted'))
1591 1591 matched = False
1592 1592 for section, name, value in ui.walkconfig(untrusted=untrusted):
1593 1593 value = str(value).replace('\n', '\\n')
1594 1594 sectname = section + '.' + name
1595 1595 if values:
1596 1596 for v in values:
1597 1597 if v == section:
1598 1598 ui.debug('%s: ' %
1599 1599 ui.configsource(section, name, untrusted))
1600 1600 ui.write('%s=%s\n' % (sectname, value))
1601 1601 matched = True
1602 1602 elif v == sectname:
1603 1603 ui.debug('%s: ' %
1604 1604 ui.configsource(section, name, untrusted))
1605 1605 ui.write(value, '\n')
1606 1606 matched = True
1607 1607 else:
1608 1608 ui.debug('%s: ' %
1609 1609 ui.configsource(section, name, untrusted))
1610 1610 ui.write('%s=%s\n' % (sectname, value))
1611 1611 matched = True
1612 1612 if matched:
1613 1613 return 0
1614 1614 return 1
1615 1615
1616 1616 @command('copy|cp',
1617 1617 [('A', 'after', None, _('record a copy that has already occurred')),
1618 1618 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1619 1619 ] + walkopts + dryrunopts,
1620 1620 _('[OPTION]... [SOURCE]... DEST'))
1621 1621 def copy(ui, repo, *pats, **opts):
1622 1622 """mark files as copied for the next commit
1623 1623
1624 1624 Mark dest as having copies of source files. If dest is a
1625 1625 directory, copies are put in that directory. If dest is a file,
1626 1626 the source must be a single file.
1627 1627
1628 1628 By default, this command copies the contents of files as they
1629 1629 exist in the working directory. If invoked with -A/--after, the
1630 1630 operation is recorded, but no copying is performed.
1631 1631
1632 1632 This command takes effect with the next commit. To undo a copy
1633 1633 before that, see :hg:`revert`.
1634 1634
1635 1635 Returns 0 on success, 1 if errors are encountered.
1636 1636 """
1637 1637 wlock = repo.wlock(False)
1638 1638 try:
1639 1639 return cmdutil.copy(ui, repo, pats, opts)
1640 1640 finally:
1641 1641 wlock.release()
1642 1642
1643 1643 @command('debugancestor', [], _('[INDEX] REV1 REV2'), optionalrepo=True)
1644 1644 def debugancestor(ui, repo, *args):
1645 1645 """find the ancestor revision of two revisions in a given index"""
1646 1646 if len(args) == 3:
1647 1647 index, rev1, rev2 = args
1648 1648 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
1649 1649 lookup = r.lookup
1650 1650 elif len(args) == 2:
1651 1651 if not repo:
1652 1652 raise util.Abort(_("there is no Mercurial repository here "
1653 1653 "(.hg not found)"))
1654 1654 rev1, rev2 = args
1655 1655 r = repo.changelog
1656 1656 lookup = repo.lookup
1657 1657 else:
1658 1658 raise util.Abort(_('either two or three arguments required'))
1659 1659 a = r.ancestor(lookup(rev1), lookup(rev2))
1660 1660 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1661 1661
1662 1662 @command('debugbuilddag',
1663 1663 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
1664 1664 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
1665 1665 ('n', 'new-file', None, _('add new file at each rev'))],
1666 1666 _('[OPTION]... [TEXT]'))
1667 1667 def debugbuilddag(ui, repo, text=None,
1668 1668 mergeable_file=False,
1669 1669 overwritten_file=False,
1670 1670 new_file=False):
1671 1671 """builds a repo with a given DAG from scratch in the current empty repo
1672 1672
1673 1673 The description of the DAG is read from stdin if not given on the
1674 1674 command line.
1675 1675
1676 1676 Elements:
1677 1677
1678 1678 - "+n" is a linear run of n nodes based on the current default parent
1679 1679 - "." is a single node based on the current default parent
1680 1680 - "$" resets the default parent to null (implied at the start);
1681 1681 otherwise the default parent is always the last node created
1682 1682 - "<p" sets the default parent to the backref p
1683 1683 - "*p" is a fork at parent p, which is a backref
1684 1684 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
1685 1685 - "/p2" is a merge of the preceding node and p2
1686 1686 - ":tag" defines a local tag for the preceding node
1687 1687 - "@branch" sets the named branch for subsequent nodes
1688 1688 - "#...\\n" is a comment up to the end of the line
1689 1689
1690 1690 Whitespace between the above elements is ignored.
1691 1691
1692 1692 A backref is either
1693 1693
1694 1694 - a number n, which references the node curr-n, where curr is the current
1695 1695 node, or
1696 1696 - the name of a local tag you placed earlier using ":tag", or
1697 1697 - empty to denote the default parent.
1698 1698
1699 1699 All string valued-elements are either strictly alphanumeric, or must
1700 1700 be enclosed in double quotes ("..."), with "\\" as escape character.
1701 1701 """
1702 1702
1703 1703 if text is None:
1704 1704 ui.status(_("reading DAG from stdin\n"))
1705 1705 text = ui.fin.read()
1706 1706
1707 1707 cl = repo.changelog
1708 1708 if len(cl) > 0:
1709 1709 raise util.Abort(_('repository is not empty'))
1710 1710
1711 1711 # determine number of revs in DAG
1712 1712 total = 0
1713 1713 for type, data in dagparser.parsedag(text):
1714 1714 if type == 'n':
1715 1715 total += 1
1716 1716
1717 1717 if mergeable_file:
1718 1718 linesperrev = 2
1719 1719 # make a file with k lines per rev
1720 1720 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
1721 1721 initialmergedlines.append("")
1722 1722
1723 1723 tags = []
1724 1724
1725 1725 lock = tr = None
1726 1726 try:
1727 1727 lock = repo.lock()
1728 1728 tr = repo.transaction("builddag")
1729 1729
1730 1730 at = -1
1731 1731 atbranch = 'default'
1732 1732 nodeids = []
1733 1733 id = 0
1734 1734 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1735 1735 for type, data in dagparser.parsedag(text):
1736 1736 if type == 'n':
1737 1737 ui.note(('node %s\n' % str(data)))
1738 1738 id, ps = data
1739 1739
1740 1740 files = []
1741 1741 fctxs = {}
1742 1742
1743 1743 p2 = None
1744 1744 if mergeable_file:
1745 1745 fn = "mf"
1746 1746 p1 = repo[ps[0]]
1747 1747 if len(ps) > 1:
1748 1748 p2 = repo[ps[1]]
1749 1749 pa = p1.ancestor(p2)
1750 1750 base, local, other = [x[fn].data() for x in (pa, p1,
1751 1751 p2)]
1752 1752 m3 = simplemerge.Merge3Text(base, local, other)
1753 1753 ml = [l.strip() for l in m3.merge_lines()]
1754 1754 ml.append("")
1755 1755 elif at > 0:
1756 1756 ml = p1[fn].data().split("\n")
1757 1757 else:
1758 1758 ml = initialmergedlines
1759 1759 ml[id * linesperrev] += " r%i" % id
1760 1760 mergedtext = "\n".join(ml)
1761 1761 files.append(fn)
1762 1762 fctxs[fn] = context.memfilectx(repo, fn, mergedtext)
1763 1763
1764 1764 if overwritten_file:
1765 1765 fn = "of"
1766 1766 files.append(fn)
1767 1767 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
1768 1768
1769 1769 if new_file:
1770 1770 fn = "nf%i" % id
1771 1771 files.append(fn)
1772 1772 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
1773 1773 if len(ps) > 1:
1774 1774 if not p2:
1775 1775 p2 = repo[ps[1]]
1776 1776 for fn in p2:
1777 1777 if fn.startswith("nf"):
1778 1778 files.append(fn)
1779 1779 fctxs[fn] = p2[fn]
1780 1780
1781 1781 def fctxfn(repo, cx, path):
1782 1782 return fctxs.get(path)
1783 1783
1784 1784 if len(ps) == 0 or ps[0] < 0:
1785 1785 pars = [None, None]
1786 1786 elif len(ps) == 1:
1787 1787 pars = [nodeids[ps[0]], None]
1788 1788 else:
1789 1789 pars = [nodeids[p] for p in ps]
1790 1790 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
1791 1791 date=(id, 0),
1792 1792 user="debugbuilddag",
1793 1793 extra={'branch': atbranch})
1794 1794 nodeid = repo.commitctx(cx)
1795 1795 nodeids.append(nodeid)
1796 1796 at = id
1797 1797 elif type == 'l':
1798 1798 id, name = data
1799 1799 ui.note(('tag %s\n' % name))
1800 1800 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
1801 1801 elif type == 'a':
1802 1802 ui.note(('branch %s\n' % data))
1803 1803 atbranch = data
1804 1804 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1805 1805 tr.close()
1806 1806
1807 1807 if tags:
1808 1808 repo.vfs.write("localtags", "".join(tags))
1809 1809 finally:
1810 1810 ui.progress(_('building'), None)
1811 1811 release(tr, lock)
1812 1812
1813 1813 @command('debugbundle',
1814 1814 [('a', 'all', None, _('show all details'))],
1815 1815 _('FILE'),
1816 1816 norepo=True)
1817 1817 def debugbundle(ui, bundlepath, all=None, **opts):
1818 1818 """lists the contents of a bundle"""
1819 1819 f = hg.openpath(ui, bundlepath)
1820 1820 try:
1821 1821 gen = exchange.readbundle(ui, f, bundlepath)
1822 1822 if isinstance(gen, bundle2.unbundle20):
1823 1823 return _debugbundle2(ui, gen, all=all, **opts)
1824 1824 if all:
1825 1825 ui.write(("format: id, p1, p2, cset, delta base, len(delta)\n"))
1826 1826
1827 1827 def showchunks(named):
1828 1828 ui.write("\n%s\n" % named)
1829 1829 chain = None
1830 1830 while True:
1831 1831 chunkdata = gen.deltachunk(chain)
1832 1832 if not chunkdata:
1833 1833 break
1834 1834 node = chunkdata['node']
1835 1835 p1 = chunkdata['p1']
1836 1836 p2 = chunkdata['p2']
1837 1837 cs = chunkdata['cs']
1838 1838 deltabase = chunkdata['deltabase']
1839 1839 delta = chunkdata['delta']
1840 1840 ui.write("%s %s %s %s %s %s\n" %
1841 1841 (hex(node), hex(p1), hex(p2),
1842 1842 hex(cs), hex(deltabase), len(delta)))
1843 1843 chain = node
1844 1844
1845 1845 chunkdata = gen.changelogheader()
1846 1846 showchunks("changelog")
1847 1847 chunkdata = gen.manifestheader()
1848 1848 showchunks("manifest")
1849 1849 while True:
1850 1850 chunkdata = gen.filelogheader()
1851 1851 if not chunkdata:
1852 1852 break
1853 1853 fname = chunkdata['filename']
1854 1854 showchunks(fname)
1855 1855 else:
1856 1856 if isinstance(gen, bundle2.unbundle20):
1857 1857 raise util.Abort(_('use debugbundle2 for this file'))
1858 1858 chunkdata = gen.changelogheader()
1859 1859 chain = None
1860 1860 while True:
1861 1861 chunkdata = gen.deltachunk(chain)
1862 1862 if not chunkdata:
1863 1863 break
1864 1864 node = chunkdata['node']
1865 1865 ui.write("%s\n" % hex(node))
1866 1866 chain = node
1867 1867 finally:
1868 1868 f.close()
1869 1869
1870 1870 def _debugbundle2(ui, gen, **opts):
1871 1871 """lists the contents of a bundle2"""
1872 1872 if not isinstance(gen, bundle2.unbundle20):
1873 1873 raise util.Abort(_('not a bundle2 file'))
1874 1874 ui.write(('Stream params: %s\n' % repr(gen.params)))
1875 1875 for part in gen.iterparts():
1876 1876 ui.write('%s -- %r\n' % (part.type, repr(part.params)))
1877 1877 if part.type == 'b2x:changegroup':
1878 1878 version = part.params.get('version', '01')
1879 1879 cg = changegroup.packermap[version][1](part, 'UN')
1880 1880 chunkdata = cg.changelogheader()
1881 1881 chain = None
1882 1882 while True:
1883 1883 chunkdata = cg.deltachunk(chain)
1884 1884 if not chunkdata:
1885 1885 break
1886 1886 node = chunkdata['node']
1887 1887 ui.write(" %s\n" % hex(node))
1888 1888 chain = node
1889 1889
1890 1890 @command('debugcheckstate', [], '')
1891 1891 def debugcheckstate(ui, repo):
1892 1892 """validate the correctness of the current dirstate"""
1893 1893 parent1, parent2 = repo.dirstate.parents()
1894 1894 m1 = repo[parent1].manifest()
1895 1895 m2 = repo[parent2].manifest()
1896 1896 errors = 0
1897 1897 for f in repo.dirstate:
1898 1898 state = repo.dirstate[f]
1899 1899 if state in "nr" and f not in m1:
1900 1900 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
1901 1901 errors += 1
1902 1902 if state in "a" and f in m1:
1903 1903 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
1904 1904 errors += 1
1905 1905 if state in "m" and f not in m1 and f not in m2:
1906 1906 ui.warn(_("%s in state %s, but not in either manifest\n") %
1907 1907 (f, state))
1908 1908 errors += 1
1909 1909 for f in m1:
1910 1910 state = repo.dirstate[f]
1911 1911 if state not in "nrm":
1912 1912 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
1913 1913 errors += 1
1914 1914 if errors:
1915 1915 error = _(".hg/dirstate inconsistent with current parent's manifest")
1916 1916 raise util.Abort(error)
1917 1917
1918 1918 @command('debugcommands', [], _('[COMMAND]'), norepo=True)
1919 1919 def debugcommands(ui, cmd='', *args):
1920 1920 """list all available commands and options"""
1921 1921 for cmd, vals in sorted(table.iteritems()):
1922 1922 cmd = cmd.split('|')[0].strip('^')
1923 1923 opts = ', '.join([i[1] for i in vals[1]])
1924 1924 ui.write('%s: %s\n' % (cmd, opts))
1925 1925
1926 1926 @command('debugcomplete',
1927 1927 [('o', 'options', None, _('show the command options'))],
1928 1928 _('[-o] CMD'),
1929 1929 norepo=True)
1930 1930 def debugcomplete(ui, cmd='', **opts):
1931 1931 """returns the completion list associated with the given command"""
1932 1932
1933 1933 if opts.get('options'):
1934 1934 options = []
1935 1935 otables = [globalopts]
1936 1936 if cmd:
1937 1937 aliases, entry = cmdutil.findcmd(cmd, table, False)
1938 1938 otables.append(entry[1])
1939 1939 for t in otables:
1940 1940 for o in t:
1941 1941 if "(DEPRECATED)" in o[3]:
1942 1942 continue
1943 1943 if o[0]:
1944 1944 options.append('-%s' % o[0])
1945 1945 options.append('--%s' % o[1])
1946 1946 ui.write("%s\n" % "\n".join(options))
1947 1947 return
1948 1948
1949 1949 cmdlist = cmdutil.findpossible(cmd, table)
1950 1950 if ui.verbose:
1951 1951 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1952 1952 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1953 1953
1954 1954 @command('debugdag',
1955 1955 [('t', 'tags', None, _('use tags as labels')),
1956 1956 ('b', 'branches', None, _('annotate with branch names')),
1957 1957 ('', 'dots', None, _('use dots for runs')),
1958 1958 ('s', 'spaces', None, _('separate elements by spaces'))],
1959 1959 _('[OPTION]... [FILE [REV]...]'),
1960 1960 optionalrepo=True)
1961 1961 def debugdag(ui, repo, file_=None, *revs, **opts):
1962 1962 """format the changelog or an index DAG as a concise textual description
1963 1963
1964 1964 If you pass a revlog index, the revlog's DAG is emitted. If you list
1965 1965 revision numbers, they get labeled in the output as rN.
1966 1966
1967 1967 Otherwise, the changelog DAG of the current repo is emitted.
1968 1968 """
1969 1969 spaces = opts.get('spaces')
1970 1970 dots = opts.get('dots')
1971 1971 if file_:
1972 1972 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
1973 1973 revs = set((int(r) for r in revs))
1974 1974 def events():
1975 1975 for r in rlog:
1976 1976 yield 'n', (r, list(p for p in rlog.parentrevs(r)
1977 1977 if p != -1))
1978 1978 if r in revs:
1979 1979 yield 'l', (r, "r%i" % r)
1980 1980 elif repo:
1981 1981 cl = repo.changelog
1982 1982 tags = opts.get('tags')
1983 1983 branches = opts.get('branches')
1984 1984 if tags:
1985 1985 labels = {}
1986 1986 for l, n in repo.tags().items():
1987 1987 labels.setdefault(cl.rev(n), []).append(l)
1988 1988 def events():
1989 1989 b = "default"
1990 1990 for r in cl:
1991 1991 if branches:
1992 1992 newb = cl.read(cl.node(r))[5]['branch']
1993 1993 if newb != b:
1994 1994 yield 'a', newb
1995 1995 b = newb
1996 1996 yield 'n', (r, list(p for p in cl.parentrevs(r)
1997 1997 if p != -1))
1998 1998 if tags:
1999 1999 ls = labels.get(r)
2000 2000 if ls:
2001 2001 for l in ls:
2002 2002 yield 'l', (r, l)
2003 2003 else:
2004 2004 raise util.Abort(_('need repo for changelog dag'))
2005 2005
2006 2006 for line in dagparser.dagtextlines(events(),
2007 2007 addspaces=spaces,
2008 2008 wraplabels=True,
2009 2009 wrapannotations=True,
2010 2010 wrapnonlinear=dots,
2011 2011 usedots=dots,
2012 2012 maxlinewidth=70):
2013 2013 ui.write(line)
2014 2014 ui.write("\n")
2015 2015
2016 2016 @command('debugdata',
2017 2017 [('c', 'changelog', False, _('open changelog')),
2018 2018 ('m', 'manifest', False, _('open manifest'))],
2019 2019 _('-c|-m|FILE REV'))
2020 2020 def debugdata(ui, repo, file_, rev=None, **opts):
2021 2021 """dump the contents of a data file revision"""
2022 2022 if opts.get('changelog') or opts.get('manifest'):
2023 2023 file_, rev = None, file_
2024 2024 elif rev is None:
2025 2025 raise error.CommandError('debugdata', _('invalid arguments'))
2026 2026 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
2027 2027 try:
2028 2028 ui.write(r.revision(r.lookup(rev)))
2029 2029 except KeyError:
2030 2030 raise util.Abort(_('invalid revision identifier %s') % rev)
2031 2031
2032 2032 @command('debugdate',
2033 2033 [('e', 'extended', None, _('try extended date formats'))],
2034 2034 _('[-e] DATE [RANGE]'),
2035 2035 norepo=True, optionalrepo=True)
2036 2036 def debugdate(ui, date, range=None, **opts):
2037 2037 """parse and display a date"""
2038 2038 if opts["extended"]:
2039 2039 d = util.parsedate(date, util.extendeddateformats)
2040 2040 else:
2041 2041 d = util.parsedate(date)
2042 2042 ui.write(("internal: %s %s\n") % d)
2043 2043 ui.write(("standard: %s\n") % util.datestr(d))
2044 2044 if range:
2045 2045 m = util.matchdate(range)
2046 2046 ui.write(("match: %s\n") % m(d[0]))
2047 2047
2048 2048 @command('debugdiscovery',
2049 2049 [('', 'old', None, _('use old-style discovery')),
2050 2050 ('', 'nonheads', None,
2051 2051 _('use old-style discovery with non-heads included')),
2052 2052 ] + remoteopts,
2053 2053 _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))
2054 2054 def debugdiscovery(ui, repo, remoteurl="default", **opts):
2055 2055 """runs the changeset discovery protocol in isolation"""
2056 2056 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl),
2057 2057 opts.get('branch'))
2058 2058 remote = hg.peer(repo, opts, remoteurl)
2059 2059 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
2060 2060
2061 2061 # make sure tests are repeatable
2062 2062 random.seed(12323)
2063 2063
2064 2064 def doit(localheads, remoteheads, remote=remote):
2065 2065 if opts.get('old'):
2066 2066 if localheads:
2067 2067 raise util.Abort('cannot use localheads with old style '
2068 2068 'discovery')
2069 2069 if not util.safehasattr(remote, 'branches'):
2070 2070 # enable in-client legacy support
2071 2071 remote = localrepo.locallegacypeer(remote.local())
2072 2072 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
2073 2073 force=True)
2074 2074 common = set(common)
2075 2075 if not opts.get('nonheads'):
2076 2076 ui.write(("unpruned common: %s\n") %
2077 2077 " ".join(sorted(short(n) for n in common)))
2078 2078 dag = dagutil.revlogdag(repo.changelog)
2079 2079 all = dag.ancestorset(dag.internalizeall(common))
2080 2080 common = dag.externalizeall(dag.headsetofconnecteds(all))
2081 2081 else:
2082 2082 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote)
2083 2083 common = set(common)
2084 2084 rheads = set(hds)
2085 2085 lheads = set(repo.heads())
2086 2086 ui.write(("common heads: %s\n") %
2087 2087 " ".join(sorted(short(n) for n in common)))
2088 2088 if lheads <= common:
2089 2089 ui.write(("local is subset\n"))
2090 2090 elif rheads <= common:
2091 2091 ui.write(("remote is subset\n"))
2092 2092
2093 2093 serverlogs = opts.get('serverlog')
2094 2094 if serverlogs:
2095 2095 for filename in serverlogs:
2096 2096 logfile = open(filename, 'r')
2097 2097 try:
2098 2098 line = logfile.readline()
2099 2099 while line:
2100 2100 parts = line.strip().split(';')
2101 2101 op = parts[1]
2102 2102 if op == 'cg':
2103 2103 pass
2104 2104 elif op == 'cgss':
2105 2105 doit(parts[2].split(' '), parts[3].split(' '))
2106 2106 elif op == 'unb':
2107 2107 doit(parts[3].split(' '), parts[2].split(' '))
2108 2108 line = logfile.readline()
2109 2109 finally:
2110 2110 logfile.close()
2111 2111
2112 2112 else:
2113 2113 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
2114 2114 opts.get('remote_head'))
2115 2115 localrevs = opts.get('local_head')
2116 2116 doit(localrevs, remoterevs)
2117 2117
2118 2118 @command('debugfileset',
2119 2119 [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))],
2120 2120 _('[-r REV] FILESPEC'))
2121 2121 def debugfileset(ui, repo, expr, **opts):
2122 2122 '''parse and apply a fileset specification'''
2123 2123 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
2124 2124 if ui.verbose:
2125 2125 tree = fileset.parse(expr)[0]
2126 2126 ui.note(tree, "\n")
2127 2127
2128 2128 for f in ctx.getfileset(expr):
2129 2129 ui.write("%s\n" % f)
2130 2130
2131 2131 @command('debugfsinfo', [], _('[PATH]'), norepo=True)
2132 2132 def debugfsinfo(ui, path="."):
2133 2133 """show information detected about current filesystem"""
2134 2134 util.writefile('.debugfsinfo', '')
2135 2135 ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no'))
2136 2136 ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no'))
2137 2137 ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no'))
2138 2138 ui.write(('case-sensitive: %s\n') % (util.checkcase('.debugfsinfo')
2139 2139 and 'yes' or 'no'))
2140 2140 os.unlink('.debugfsinfo')
2141 2141
2142 2142 @command('debuggetbundle',
2143 2143 [('H', 'head', [], _('id of head node'), _('ID')),
2144 2144 ('C', 'common', [], _('id of common node'), _('ID')),
2145 2145 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
2146 2146 _('REPO FILE [-H|-C ID]...'),
2147 2147 norepo=True)
2148 2148 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
2149 2149 """retrieves a bundle from a repo
2150 2150
2151 2151 Every ID must be a full-length hex node id string. Saves the bundle to the
2152 2152 given file.
2153 2153 """
2154 2154 repo = hg.peer(ui, opts, repopath)
2155 2155 if not repo.capable('getbundle'):
2156 2156 raise util.Abort("getbundle() not supported by target repository")
2157 2157 args = {}
2158 2158 if common:
2159 2159 args['common'] = [bin(s) for s in common]
2160 2160 if head:
2161 2161 args['heads'] = [bin(s) for s in head]
2162 2162 # TODO: get desired bundlecaps from command line.
2163 2163 args['bundlecaps'] = None
2164 2164 bundle = repo.getbundle('debug', **args)
2165 2165
2166 2166 bundletype = opts.get('type', 'bzip2').lower()
2167 2167 btypes = {'none': 'HG10UN',
2168 2168 'bzip2': 'HG10BZ',
2169 2169 'gzip': 'HG10GZ',
2170 2170 'bundle2': 'HG2Y'}
2171 2171 bundletype = btypes.get(bundletype)
2172 2172 if bundletype not in changegroup.bundletypes:
2173 2173 raise util.Abort(_('unknown bundle type specified with --type'))
2174 2174 changegroup.writebundle(ui, bundle, bundlepath, bundletype)
2175 2175
2176 2176 @command('debugignore', [], '')
2177 2177 def debugignore(ui, repo, *values, **opts):
2178 2178 """display the combined ignore pattern"""
2179 2179 ignore = repo.dirstate._ignore
2180 2180 includepat = getattr(ignore, 'includepat', None)
2181 2181 if includepat is not None:
2182 2182 ui.write("%s\n" % includepat)
2183 2183 else:
2184 2184 raise util.Abort(_("no ignore patterns found"))
2185 2185
2186 2186 @command('debugindex',
2187 2187 [('c', 'changelog', False, _('open changelog')),
2188 2188 ('m', 'manifest', False, _('open manifest')),
2189 2189 ('f', 'format', 0, _('revlog format'), _('FORMAT'))],
2190 2190 _('[-f FORMAT] -c|-m|FILE'),
2191 2191 optionalrepo=True)
2192 2192 def debugindex(ui, repo, file_=None, **opts):
2193 2193 """dump the contents of an index file"""
2194 2194 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
2195 2195 format = opts.get('format', 0)
2196 2196 if format not in (0, 1):
2197 2197 raise util.Abort(_("unknown format %d") % format)
2198 2198
2199 2199 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2200 2200 if generaldelta:
2201 2201 basehdr = ' delta'
2202 2202 else:
2203 2203 basehdr = ' base'
2204 2204
2205 2205 if ui.debugflag:
2206 2206 shortfn = hex
2207 2207 else:
2208 2208 shortfn = short
2209 2209
2210 2210 # There might not be anything in r, so have a sane default
2211 2211 idlen = 12
2212 2212 for i in r:
2213 2213 idlen = len(shortfn(r.node(i)))
2214 2214 break
2215 2215
2216 2216 if format == 0:
2217 2217 ui.write(" rev offset length " + basehdr + " linkrev"
2218 2218 " %s %s p2\n" % ("nodeid".ljust(idlen), "p1".ljust(idlen)))
2219 2219 elif format == 1:
2220 2220 ui.write(" rev flag offset length"
2221 2221 " size " + basehdr + " link p1 p2"
2222 2222 " %s\n" % "nodeid".rjust(idlen))
2223 2223
2224 2224 for i in r:
2225 2225 node = r.node(i)
2226 2226 if generaldelta:
2227 2227 base = r.deltaparent(i)
2228 2228 else:
2229 2229 base = r.chainbase(i)
2230 2230 if format == 0:
2231 2231 try:
2232 2232 pp = r.parents(node)
2233 2233 except Exception:
2234 2234 pp = [nullid, nullid]
2235 2235 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
2236 2236 i, r.start(i), r.length(i), base, r.linkrev(i),
2237 2237 shortfn(node), shortfn(pp[0]), shortfn(pp[1])))
2238 2238 elif format == 1:
2239 2239 pr = r.parentrevs(i)
2240 2240 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
2241 2241 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
2242 2242 base, r.linkrev(i), pr[0], pr[1], shortfn(node)))
2243 2243
2244 2244 @command('debugindexdot', [], _('FILE'), optionalrepo=True)
2245 2245 def debugindexdot(ui, repo, file_):
2246 2246 """dump an index DAG as a graphviz dot file"""
2247 2247 r = None
2248 2248 if repo:
2249 2249 filelog = repo.file(file_)
2250 2250 if len(filelog):
2251 2251 r = filelog
2252 2252 if not r:
2253 2253 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
2254 2254 ui.write(("digraph G {\n"))
2255 2255 for i in r:
2256 2256 node = r.node(i)
2257 2257 pp = r.parents(node)
2258 2258 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
2259 2259 if pp[1] != nullid:
2260 2260 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
2261 2261 ui.write("}\n")
2262 2262
2263 2263 @command('debuginstall', [], '', norepo=True)
2264 2264 def debuginstall(ui):
2265 2265 '''test Mercurial installation
2266 2266
2267 2267 Returns 0 on success.
2268 2268 '''
2269 2269
2270 2270 def writetemp(contents):
2271 2271 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
2272 2272 f = os.fdopen(fd, "wb")
2273 2273 f.write(contents)
2274 2274 f.close()
2275 2275 return name
2276 2276
2277 2277 problems = 0
2278 2278
2279 2279 # encoding
2280 2280 ui.status(_("checking encoding (%s)...\n") % encoding.encoding)
2281 2281 try:
2282 2282 encoding.fromlocal("test")
2283 2283 except util.Abort, inst:
2284 2284 ui.write(" %s\n" % inst)
2285 2285 ui.write(_(" (check that your locale is properly set)\n"))
2286 2286 problems += 1
2287 2287
2288 2288 # Python
2289 2289 ui.status(_("checking Python executable (%s)\n") % sys.executable)
2290 2290 ui.status(_("checking Python version (%s)\n")
2291 2291 % ("%s.%s.%s" % sys.version_info[:3]))
2292 2292 ui.status(_("checking Python lib (%s)...\n")
2293 2293 % os.path.dirname(os.__file__))
2294 2294
2295 2295 # compiled modules
2296 2296 ui.status(_("checking installed modules (%s)...\n")
2297 2297 % os.path.dirname(__file__))
2298 2298 try:
2299 2299 import bdiff, mpatch, base85, osutil
2300 2300 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
2301 2301 except Exception, inst:
2302 2302 ui.write(" %s\n" % inst)
2303 2303 ui.write(_(" One or more extensions could not be found"))
2304 2304 ui.write(_(" (check that you compiled the extensions)\n"))
2305 2305 problems += 1
2306 2306
2307 2307 # templates
2308 2308 import templater
2309 2309 p = templater.templatepaths()
2310 2310 ui.status(_("checking templates (%s)...\n") % ' '.join(p))
2311 2311 if p:
2312 2312 m = templater.templatepath("map-cmdline.default")
2313 2313 if m:
2314 2314 # template found, check if it is working
2315 2315 try:
2316 2316 templater.templater(m)
2317 2317 except Exception, inst:
2318 2318 ui.write(" %s\n" % inst)
2319 2319 p = None
2320 2320 else:
2321 2321 ui.write(_(" template 'default' not found\n"))
2322 2322 p = None
2323 2323 else:
2324 2324 ui.write(_(" no template directories found\n"))
2325 2325 if not p:
2326 2326 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
2327 2327 problems += 1
2328 2328
2329 2329 # editor
2330 2330 ui.status(_("checking commit editor...\n"))
2331 2331 editor = ui.geteditor()
2332 2332 cmdpath = util.findexe(shlex.split(editor)[0])
2333 2333 if not cmdpath:
2334 2334 if editor == 'vi':
2335 2335 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
2336 2336 ui.write(_(" (specify a commit editor in your configuration"
2337 2337 " file)\n"))
2338 2338 else:
2339 2339 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
2340 2340 ui.write(_(" (specify a commit editor in your configuration"
2341 2341 " file)\n"))
2342 2342 problems += 1
2343 2343
2344 2344 # check username
2345 2345 ui.status(_("checking username...\n"))
2346 2346 try:
2347 2347 ui.username()
2348 2348 except util.Abort, e:
2349 2349 ui.write(" %s\n" % e)
2350 2350 ui.write(_(" (specify a username in your configuration file)\n"))
2351 2351 problems += 1
2352 2352
2353 2353 if not problems:
2354 2354 ui.status(_("no problems detected\n"))
2355 2355 else:
2356 2356 ui.write(_("%s problems detected,"
2357 2357 " please check your install!\n") % problems)
2358 2358
2359 2359 return problems
2360 2360
2361 2361 @command('debugknown', [], _('REPO ID...'), norepo=True)
2362 2362 def debugknown(ui, repopath, *ids, **opts):
2363 2363 """test whether node ids are known to a repo
2364 2364
2365 2365 Every ID must be a full-length hex node id string. Returns a list of 0s
2366 2366 and 1s indicating unknown/known.
2367 2367 """
2368 2368 repo = hg.peer(ui, opts, repopath)
2369 2369 if not repo.capable('known'):
2370 2370 raise util.Abort("known() not supported by target repository")
2371 2371 flags = repo.known([bin(s) for s in ids])
2372 2372 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2373 2373
2374 2374 @command('debuglabelcomplete', [], _('LABEL...'))
2375 2375 def debuglabelcomplete(ui, repo, *args):
2376 2376 '''backwards compatibility with old bash completion scripts (DEPRECATED)'''
2377 2377 debugnamecomplete(ui, repo, *args)
2378 2378
2379 2379 @command('debugnamecomplete', [], _('NAME...'))
2380 2380 def debugnamecomplete(ui, repo, *args):
2381 2381 '''complete "names" - tags, open branch names, bookmark names'''
2382 2382
2383 2383 names = set()
2384 2384 # since we previously only listed open branches, we will handle that
2385 2385 # specially (after this for loop)
2386 2386 for name, ns in repo.names.iteritems():
2387 2387 if name != 'branches':
2388 2388 names.update(ns.listnames(repo))
2389 2389 names.update(tag for (tag, heads, tip, closed)
2390 2390 in repo.branchmap().iterbranches() if not closed)
2391 2391 completions = set()
2392 2392 if not args:
2393 2393 args = ['']
2394 2394 for a in args:
2395 2395 completions.update(n for n in names if n.startswith(a))
2396 2396 ui.write('\n'.join(sorted(completions)))
2397 2397 ui.write('\n')
2398 2398
2399 2399 @command('debuglocks',
2400 2400 [('L', 'force-lock', None, _('free the store lock (DANGEROUS)')),
2401 2401 ('W', 'force-wlock', None,
2402 2402 _('free the working state lock (DANGEROUS)'))],
2403 2403 _('[OPTION]...'))
2404 2404 def debuglocks(ui, repo, **opts):
2405 2405 """show or modify state of locks
2406 2406
2407 2407 By default, this command will show which locks are held. This
2408 2408 includes the user and process holding the lock, the amount of time
2409 2409 the lock has been held, and the machine name where the process is
2410 2410 running if it's not local.
2411 2411
2412 2412 Locks protect the integrity of Mercurial's data, so should be
2413 2413 treated with care. System crashes or other interruptions may cause
2414 2414 locks to not be properly released, though Mercurial will usually
2415 2415 detect and remove such stale locks automatically.
2416 2416
2417 2417 However, detecting stale locks may not always be possible (for
2418 2418 instance, on a shared filesystem). Removing locks may also be
2419 2419 blocked by filesystem permissions.
2420 2420
2421 2421 Returns 0 if no locks are held.
2422 2422
2423 2423 """
2424 2424
2425 2425 if opts.get('force_lock'):
2426 2426 repo.svfs.unlink('lock')
2427 2427 if opts.get('force_wlock'):
2428 2428 repo.vfs.unlink('wlock')
2429 2429 if opts.get('force_lock') or opts.get('force_lock'):
2430 2430 return 0
2431 2431
2432 2432 now = time.time()
2433 2433 held = 0
2434 2434
2435 2435 def report(vfs, name, method):
2436 2436 # this causes stale locks to get reaped for more accurate reporting
2437 2437 try:
2438 2438 l = method(False)
2439 2439 except error.LockHeld:
2440 2440 l = None
2441 2441
2442 2442 if l:
2443 2443 l.release()
2444 2444 else:
2445 2445 try:
2446 2446 stat = repo.svfs.lstat(name)
2447 2447 age = now - stat.st_mtime
2448 2448 user = util.username(stat.st_uid)
2449 2449 locker = vfs.readlock(name)
2450 2450 if ":" in locker:
2451 2451 host, pid = locker.split(':')
2452 2452 if host == socket.gethostname():
2453 2453 locker = 'user %s, process %s' % (user, pid)
2454 2454 else:
2455 2455 locker = 'user %s, process %s, host %s' \
2456 2456 % (user, pid, host)
2457 2457 ui.write("%-6s %s (%ds)\n" % (name + ":", locker, age))
2458 2458 return 1
2459 2459 except OSError, e:
2460 2460 if e.errno != errno.ENOENT:
2461 2461 raise
2462 2462
2463 2463 ui.write("%-6s free\n" % (name + ":"))
2464 2464 return 0
2465 2465
2466 2466 held += report(repo.svfs, "lock", repo.lock)
2467 2467 held += report(repo.vfs, "wlock", repo.wlock)
2468 2468
2469 2469 return held
2470 2470
2471 2471 @command('debugobsolete',
2472 2472 [('', 'flags', 0, _('markers flag')),
2473 2473 ('', 'record-parents', False,
2474 2474 _('record parent information for the precursor')),
2475 2475 ('r', 'rev', [], _('display markers relevant to REV')),
2476 2476 ] + commitopts2,
2477 2477 _('[OBSOLETED [REPLACEMENT] [REPL... ]'))
2478 2478 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
2479 2479 """create arbitrary obsolete marker
2480 2480
2481 2481 With no arguments, displays the list of obsolescence markers."""
2482 2482
2483 2483 def parsenodeid(s):
2484 2484 try:
2485 2485 # We do not use revsingle/revrange functions here to accept
2486 2486 # arbitrary node identifiers, possibly not present in the
2487 2487 # local repository.
2488 2488 n = bin(s)
2489 2489 if len(n) != len(nullid):
2490 2490 raise TypeError()
2491 2491 return n
2492 2492 except TypeError:
2493 2493 raise util.Abort('changeset references must be full hexadecimal '
2494 2494 'node identifiers')
2495 2495
2496 2496 if precursor is not None:
2497 2497 if opts['rev']:
2498 2498 raise util.Abort('cannot select revision when creating marker')
2499 2499 metadata = {}
2500 2500 metadata['user'] = opts['user'] or ui.username()
2501 2501 succs = tuple(parsenodeid(succ) for succ in successors)
2502 2502 l = repo.lock()
2503 2503 try:
2504 2504 tr = repo.transaction('debugobsolete')
2505 2505 try:
2506 2506 try:
2507 2507 date = opts.get('date')
2508 2508 if date:
2509 2509 date = util.parsedate(date)
2510 2510 else:
2511 2511 date = None
2512 2512 prec = parsenodeid(precursor)
2513 2513 parents = None
2514 2514 if opts['record_parents']:
2515 2515 if prec not in repo.unfiltered():
2516 2516 raise util.Abort('cannot used --record-parents on '
2517 2517 'unknown changesets')
2518 2518 parents = repo.unfiltered()[prec].parents()
2519 2519 parents = tuple(p.node() for p in parents)
2520 2520 repo.obsstore.create(tr, prec, succs, opts['flags'],
2521 2521 parents=parents, date=date,
2522 2522 metadata=metadata)
2523 2523 tr.close()
2524 2524 except ValueError, exc:
2525 2525 raise util.Abort(_('bad obsmarker input: %s') % exc)
2526 2526 finally:
2527 2527 tr.release()
2528 2528 finally:
2529 2529 l.release()
2530 2530 else:
2531 2531 if opts['rev']:
2532 2532 revs = scmutil.revrange(repo, opts['rev'])
2533 2533 nodes = [repo[r].node() for r in revs]
2534 2534 markers = list(obsolete.getmarkers(repo, nodes=nodes))
2535 2535 markers.sort(key=lambda x: x._data)
2536 2536 else:
2537 2537 markers = obsolete.getmarkers(repo)
2538 2538
2539 2539 for m in markers:
2540 2540 cmdutil.showmarker(ui, m)
2541 2541
2542 2542 @command('debugpathcomplete',
2543 2543 [('f', 'full', None, _('complete an entire path')),
2544 2544 ('n', 'normal', None, _('show only normal files')),
2545 2545 ('a', 'added', None, _('show only added files')),
2546 2546 ('r', 'removed', None, _('show only removed files'))],
2547 2547 _('FILESPEC...'))
2548 2548 def debugpathcomplete(ui, repo, *specs, **opts):
2549 2549 '''complete part or all of a tracked path
2550 2550
2551 2551 This command supports shells that offer path name completion. It
2552 2552 currently completes only files already known to the dirstate.
2553 2553
2554 2554 Completion extends only to the next path segment unless
2555 2555 --full is specified, in which case entire paths are used.'''
2556 2556
2557 2557 def complete(path, acceptable):
2558 2558 dirstate = repo.dirstate
2559 2559 spec = os.path.normpath(os.path.join(os.getcwd(), path))
2560 2560 rootdir = repo.root + os.sep
2561 2561 if spec != repo.root and not spec.startswith(rootdir):
2562 2562 return [], []
2563 2563 if os.path.isdir(spec):
2564 2564 spec += '/'
2565 2565 spec = spec[len(rootdir):]
2566 2566 fixpaths = os.sep != '/'
2567 2567 if fixpaths:
2568 2568 spec = spec.replace(os.sep, '/')
2569 2569 speclen = len(spec)
2570 2570 fullpaths = opts['full']
2571 2571 files, dirs = set(), set()
2572 2572 adddir, addfile = dirs.add, files.add
2573 2573 for f, st in dirstate.iteritems():
2574 2574 if f.startswith(spec) and st[0] in acceptable:
2575 2575 if fixpaths:
2576 2576 f = f.replace('/', os.sep)
2577 2577 if fullpaths:
2578 2578 addfile(f)
2579 2579 continue
2580 2580 s = f.find(os.sep, speclen)
2581 2581 if s >= 0:
2582 2582 adddir(f[:s])
2583 2583 else:
2584 2584 addfile(f)
2585 2585 return files, dirs
2586 2586
2587 2587 acceptable = ''
2588 2588 if opts['normal']:
2589 2589 acceptable += 'nm'
2590 2590 if opts['added']:
2591 2591 acceptable += 'a'
2592 2592 if opts['removed']:
2593 2593 acceptable += 'r'
2594 2594 cwd = repo.getcwd()
2595 2595 if not specs:
2596 2596 specs = ['.']
2597 2597
2598 2598 files, dirs = set(), set()
2599 2599 for spec in specs:
2600 2600 f, d = complete(spec, acceptable or 'nmar')
2601 2601 files.update(f)
2602 2602 dirs.update(d)
2603 2603 files.update(dirs)
2604 2604 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
2605 2605 ui.write('\n')
2606 2606
2607 2607 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
2608 2608 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
2609 2609 '''access the pushkey key/value protocol
2610 2610
2611 2611 With two args, list the keys in the given namespace.
2612 2612
2613 2613 With five args, set a key to new if it currently is set to old.
2614 2614 Reports success or failure.
2615 2615 '''
2616 2616
2617 2617 target = hg.peer(ui, {}, repopath)
2618 2618 if keyinfo:
2619 2619 key, old, new = keyinfo
2620 2620 r = target.pushkey(namespace, key, old, new)
2621 2621 ui.status(str(r) + '\n')
2622 2622 return not r
2623 2623 else:
2624 2624 for k, v in sorted(target.listkeys(namespace).iteritems()):
2625 2625 ui.write("%s\t%s\n" % (k.encode('string-escape'),
2626 2626 v.encode('string-escape')))
2627 2627
2628 2628 @command('debugpvec', [], _('A B'))
2629 2629 def debugpvec(ui, repo, a, b=None):
2630 2630 ca = scmutil.revsingle(repo, a)
2631 2631 cb = scmutil.revsingle(repo, b)
2632 2632 pa = pvec.ctxpvec(ca)
2633 2633 pb = pvec.ctxpvec(cb)
2634 2634 if pa == pb:
2635 2635 rel = "="
2636 2636 elif pa > pb:
2637 2637 rel = ">"
2638 2638 elif pa < pb:
2639 2639 rel = "<"
2640 2640 elif pa | pb:
2641 2641 rel = "|"
2642 2642 ui.write(_("a: %s\n") % pa)
2643 2643 ui.write(_("b: %s\n") % pb)
2644 2644 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
2645 2645 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
2646 2646 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
2647 2647 pa.distance(pb), rel))
2648 2648
2649 2649 @command('debugrebuilddirstate|debugrebuildstate',
2650 2650 [('r', 'rev', '', _('revision to rebuild to'), _('REV'))],
2651 2651 _('[-r REV]'))
2652 2652 def debugrebuilddirstate(ui, repo, rev):
2653 2653 """rebuild the dirstate as it would look like for the given revision
2654 2654
2655 2655 If no revision is specified the first current parent will be used.
2656 2656
2657 2657 The dirstate will be set to the files of the given revision.
2658 2658 The actual working directory content or existing dirstate
2659 2659 information such as adds or removes is not considered.
2660 2660
2661 2661 One use of this command is to make the next :hg:`status` invocation
2662 2662 check the actual file content.
2663 2663 """
2664 2664 ctx = scmutil.revsingle(repo, rev)
2665 2665 wlock = repo.wlock()
2666 2666 try:
2667 2667 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
2668 2668 finally:
2669 2669 wlock.release()
2670 2670
2671 2671 @command('debugrename',
2672 2672 [('r', 'rev', '', _('revision to debug'), _('REV'))],
2673 2673 _('[-r REV] FILE'))
2674 2674 def debugrename(ui, repo, file1, *pats, **opts):
2675 2675 """dump rename information"""
2676 2676
2677 2677 ctx = scmutil.revsingle(repo, opts.get('rev'))
2678 2678 m = scmutil.match(ctx, (file1,) + pats, opts)
2679 2679 for abs in ctx.walk(m):
2680 2680 fctx = ctx[abs]
2681 2681 o = fctx.filelog().renamed(fctx.filenode())
2682 2682 rel = m.rel(abs)
2683 2683 if o:
2684 2684 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
2685 2685 else:
2686 2686 ui.write(_("%s not renamed\n") % rel)
2687 2687
2688 2688 @command('debugrevlog',
2689 2689 [('c', 'changelog', False, _('open changelog')),
2690 2690 ('m', 'manifest', False, _('open manifest')),
2691 2691 ('d', 'dump', False, _('dump index data'))],
2692 2692 _('-c|-m|FILE'),
2693 2693 optionalrepo=True)
2694 2694 def debugrevlog(ui, repo, file_=None, **opts):
2695 2695 """show data and statistics about a revlog"""
2696 2696 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
2697 2697
2698 2698 if opts.get("dump"):
2699 2699 numrevs = len(r)
2700 2700 ui.write("# rev p1rev p2rev start end deltastart base p1 p2"
2701 2701 " rawsize totalsize compression heads chainlen\n")
2702 2702 ts = 0
2703 2703 heads = set()
2704 2704
2705 2705 for rev in xrange(numrevs):
2706 2706 dbase = r.deltaparent(rev)
2707 2707 if dbase == -1:
2708 2708 dbase = rev
2709 2709 cbase = r.chainbase(rev)
2710 2710 clen = r.chainlen(rev)
2711 2711 p1, p2 = r.parentrevs(rev)
2712 2712 rs = r.rawsize(rev)
2713 2713 ts = ts + rs
2714 2714 heads -= set(r.parentrevs(rev))
2715 2715 heads.add(rev)
2716 2716 ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d "
2717 2717 "%11d %5d %8d\n" %
2718 2718 (rev, p1, p2, r.start(rev), r.end(rev),
2719 2719 r.start(dbase), r.start(cbase),
2720 2720 r.start(p1), r.start(p2),
2721 2721 rs, ts, ts / r.end(rev), len(heads), clen))
2722 2722 return 0
2723 2723
2724 2724 v = r.version
2725 2725 format = v & 0xFFFF
2726 2726 flags = []
2727 2727 gdelta = False
2728 2728 if v & revlog.REVLOGNGINLINEDATA:
2729 2729 flags.append('inline')
2730 2730 if v & revlog.REVLOGGENERALDELTA:
2731 2731 gdelta = True
2732 2732 flags.append('generaldelta')
2733 2733 if not flags:
2734 2734 flags = ['(none)']
2735 2735
2736 2736 nummerges = 0
2737 2737 numfull = 0
2738 2738 numprev = 0
2739 2739 nump1 = 0
2740 2740 nump2 = 0
2741 2741 numother = 0
2742 2742 nump1prev = 0
2743 2743 nump2prev = 0
2744 2744 chainlengths = []
2745 2745
2746 2746 datasize = [None, 0, 0L]
2747 2747 fullsize = [None, 0, 0L]
2748 2748 deltasize = [None, 0, 0L]
2749 2749
2750 2750 def addsize(size, l):
2751 2751 if l[0] is None or size < l[0]:
2752 2752 l[0] = size
2753 2753 if size > l[1]:
2754 2754 l[1] = size
2755 2755 l[2] += size
2756 2756
2757 2757 numrevs = len(r)
2758 2758 for rev in xrange(numrevs):
2759 2759 p1, p2 = r.parentrevs(rev)
2760 2760 delta = r.deltaparent(rev)
2761 2761 if format > 0:
2762 2762 addsize(r.rawsize(rev), datasize)
2763 2763 if p2 != nullrev:
2764 2764 nummerges += 1
2765 2765 size = r.length(rev)
2766 2766 if delta == nullrev:
2767 2767 chainlengths.append(0)
2768 2768 numfull += 1
2769 2769 addsize(size, fullsize)
2770 2770 else:
2771 2771 chainlengths.append(chainlengths[delta] + 1)
2772 2772 addsize(size, deltasize)
2773 2773 if delta == rev - 1:
2774 2774 numprev += 1
2775 2775 if delta == p1:
2776 2776 nump1prev += 1
2777 2777 elif delta == p2:
2778 2778 nump2prev += 1
2779 2779 elif delta == p1:
2780 2780 nump1 += 1
2781 2781 elif delta == p2:
2782 2782 nump2 += 1
2783 2783 elif delta != nullrev:
2784 2784 numother += 1
2785 2785
2786 2786 # Adjust size min value for empty cases
2787 2787 for size in (datasize, fullsize, deltasize):
2788 2788 if size[0] is None:
2789 2789 size[0] = 0
2790 2790
2791 2791 numdeltas = numrevs - numfull
2792 2792 numoprev = numprev - nump1prev - nump2prev
2793 2793 totalrawsize = datasize[2]
2794 2794 datasize[2] /= numrevs
2795 2795 fulltotal = fullsize[2]
2796 2796 fullsize[2] /= numfull
2797 2797 deltatotal = deltasize[2]
2798 2798 if numrevs - numfull > 0:
2799 2799 deltasize[2] /= numrevs - numfull
2800 2800 totalsize = fulltotal + deltatotal
2801 2801 avgchainlen = sum(chainlengths) / numrevs
2802 2802 compratio = totalrawsize / totalsize
2803 2803
2804 2804 basedfmtstr = '%%%dd\n'
2805 2805 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
2806 2806
2807 2807 def dfmtstr(max):
2808 2808 return basedfmtstr % len(str(max))
2809 2809 def pcfmtstr(max, padding=0):
2810 2810 return basepcfmtstr % (len(str(max)), ' ' * padding)
2811 2811
2812 2812 def pcfmt(value, total):
2813 2813 return (value, 100 * float(value) / total)
2814 2814
2815 2815 ui.write(('format : %d\n') % format)
2816 2816 ui.write(('flags : %s\n') % ', '.join(flags))
2817 2817
2818 2818 ui.write('\n')
2819 2819 fmt = pcfmtstr(totalsize)
2820 2820 fmt2 = dfmtstr(totalsize)
2821 2821 ui.write(('revisions : ') + fmt2 % numrevs)
2822 2822 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
2823 2823 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
2824 2824 ui.write(('revisions : ') + fmt2 % numrevs)
2825 2825 ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
2826 2826 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
2827 2827 ui.write(('revision size : ') + fmt2 % totalsize)
2828 2828 ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
2829 2829 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
2830 2830
2831 2831 ui.write('\n')
2832 2832 fmt = dfmtstr(max(avgchainlen, compratio))
2833 2833 ui.write(('avg chain length : ') + fmt % avgchainlen)
2834 2834 ui.write(('compression ratio : ') + fmt % compratio)
2835 2835
2836 2836 if format > 0:
2837 2837 ui.write('\n')
2838 2838 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
2839 2839 % tuple(datasize))
2840 2840 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
2841 2841 % tuple(fullsize))
2842 2842 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
2843 2843 % tuple(deltasize))
2844 2844
2845 2845 if numdeltas > 0:
2846 2846 ui.write('\n')
2847 2847 fmt = pcfmtstr(numdeltas)
2848 2848 fmt2 = pcfmtstr(numdeltas, 4)
2849 2849 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
2850 2850 if numprev > 0:
2851 2851 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
2852 2852 numprev))
2853 2853 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
2854 2854 numprev))
2855 2855 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
2856 2856 numprev))
2857 2857 if gdelta:
2858 2858 ui.write(('deltas against p1 : ')
2859 2859 + fmt % pcfmt(nump1, numdeltas))
2860 2860 ui.write(('deltas against p2 : ')
2861 2861 + fmt % pcfmt(nump2, numdeltas))
2862 2862 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
2863 2863 numdeltas))
2864 2864
2865 2865 @command('debugrevspec',
2866 2866 [('', 'optimize', None, _('print parsed tree after optimizing'))],
2867 2867 ('REVSPEC'))
2868 2868 def debugrevspec(ui, repo, expr, **opts):
2869 2869 """parse and apply a revision specification
2870 2870
2871 2871 Use --verbose to print the parsed tree before and after aliases
2872 2872 expansion.
2873 2873 """
2874 2874 if ui.verbose:
2875 2875 tree = revset.parse(expr)[0]
2876 2876 ui.note(revset.prettyformat(tree), "\n")
2877 2877 newtree = revset.findaliases(ui, tree)
2878 2878 if newtree != tree:
2879 2879 ui.note(revset.prettyformat(newtree), "\n")
2880 2880 tree = newtree
2881 2881 newtree = revset.foldconcat(tree)
2882 2882 if newtree != tree:
2883 2883 ui.note(revset.prettyformat(newtree), "\n")
2884 2884 if opts["optimize"]:
2885 2885 weight, optimizedtree = revset.optimize(newtree, True)
2886 2886 ui.note("* optimized:\n", revset.prettyformat(optimizedtree), "\n")
2887 2887 func = revset.match(ui, expr)
2888 2888 for c in func(repo):
2889 2889 ui.write("%s\n" % c)
2890 2890
2891 2891 @command('debugsetparents', [], _('REV1 [REV2]'))
2892 2892 def debugsetparents(ui, repo, rev1, rev2=None):
2893 2893 """manually set the parents of the current working directory
2894 2894
2895 2895 This is useful for writing repository conversion tools, but should
2896 2896 be used with care. For example, neither the working copy nor the dirstate
2897 2897 is updated, so file status may be incorrect after running this command.
2898 2898
2899 2899 Returns 0 on success.
2900 2900 """
2901 2901
2902 2902 r1 = scmutil.revsingle(repo, rev1).node()
2903 2903 r2 = scmutil.revsingle(repo, rev2, 'null').node()
2904 2904
2905 2905 wlock = repo.wlock()
2906 2906 try:
2907 2907 repo.dirstate.beginparentchange()
2908 2908 repo.setparents(r1, r2)
2909 2909 repo.dirstate.endparentchange()
2910 2910 finally:
2911 2911 wlock.release()
2912 2912
2913 2913 @command('debugdirstate|debugstate',
2914 2914 [('', 'nodates', None, _('do not display the saved mtime')),
2915 2915 ('', 'datesort', None, _('sort by saved mtime'))],
2916 2916 _('[OPTION]...'))
2917 2917 def debugstate(ui, repo, nodates=None, datesort=None):
2918 2918 """show the contents of the current dirstate"""
2919 2919 timestr = ""
2920 2920 if datesort:
2921 2921 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
2922 2922 else:
2923 2923 keyfunc = None # sort by filename
2924 2924 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
2925 2925 if ent[3] == -1:
2926 2926 timestr = 'unset '
2927 2927 elif nodates:
2928 2928 timestr = 'set '
2929 2929 else:
2930 2930 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
2931 2931 time.localtime(ent[3]))
2932 2932 if ent[1] & 020000:
2933 2933 mode = 'lnk'
2934 2934 else:
2935 2935 mode = '%3o' % (ent[1] & 0777 & ~util.umask)
2936 2936 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
2937 2937 for f in repo.dirstate.copies():
2938 2938 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
2939 2939
2940 2940 @command('debugsub',
2941 2941 [('r', 'rev', '',
2942 2942 _('revision to check'), _('REV'))],
2943 2943 _('[-r REV] [REV]'))
2944 2944 def debugsub(ui, repo, rev=None):
2945 2945 ctx = scmutil.revsingle(repo, rev, None)
2946 2946 for k, v in sorted(ctx.substate.items()):
2947 2947 ui.write(('path %s\n') % k)
2948 2948 ui.write((' source %s\n') % v[0])
2949 2949 ui.write((' revision %s\n') % v[1])
2950 2950
2951 2951 @command('debugsuccessorssets',
2952 2952 [],
2953 2953 _('[REV]'))
2954 2954 def debugsuccessorssets(ui, repo, *revs):
2955 2955 """show set of successors for revision
2956 2956
2957 2957 A successors set of changeset A is a consistent group of revisions that
2958 2958 succeed A. It contains non-obsolete changesets only.
2959 2959
2960 2960 In most cases a changeset A has a single successors set containing a single
2961 2961 successor (changeset A replaced by A').
2962 2962
2963 2963 A changeset that is made obsolete with no successors are called "pruned".
2964 2964 Such changesets have no successors sets at all.
2965 2965
2966 2966 A changeset that has been "split" will have a successors set containing
2967 2967 more than one successor.
2968 2968
2969 2969 A changeset that has been rewritten in multiple different ways is called
2970 2970 "divergent". Such changesets have multiple successor sets (each of which
2971 2971 may also be split, i.e. have multiple successors).
2972 2972
2973 2973 Results are displayed as follows::
2974 2974
2975 2975 <rev1>
2976 2976 <successors-1A>
2977 2977 <rev2>
2978 2978 <successors-2A>
2979 2979 <successors-2B1> <successors-2B2> <successors-2B3>
2980 2980
2981 2981 Here rev2 has two possible (i.e. divergent) successors sets. The first
2982 2982 holds one element, whereas the second holds three (i.e. the changeset has
2983 2983 been split).
2984 2984 """
2985 2985 # passed to successorssets caching computation from one call to another
2986 2986 cache = {}
2987 2987 ctx2str = str
2988 2988 node2str = short
2989 2989 if ui.debug():
2990 2990 def ctx2str(ctx):
2991 2991 return ctx.hex()
2992 2992 node2str = hex
2993 2993 for rev in scmutil.revrange(repo, revs):
2994 2994 ctx = repo[rev]
2995 2995 ui.write('%s\n'% ctx2str(ctx))
2996 2996 for succsset in obsolete.successorssets(repo, ctx.node(), cache):
2997 2997 if succsset:
2998 2998 ui.write(' ')
2999 2999 ui.write(node2str(succsset[0]))
3000 3000 for node in succsset[1:]:
3001 3001 ui.write(' ')
3002 3002 ui.write(node2str(node))
3003 3003 ui.write('\n')
3004 3004
3005 3005 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'), inferrepo=True)
3006 3006 def debugwalk(ui, repo, *pats, **opts):
3007 3007 """show how files match on given patterns"""
3008 3008 m = scmutil.match(repo[None], pats, opts)
3009 3009 items = list(repo.walk(m))
3010 3010 if not items:
3011 3011 return
3012 3012 f = lambda fn: fn
3013 3013 if ui.configbool('ui', 'slash') and os.sep != '/':
3014 3014 f = lambda fn: util.normpath(fn)
3015 3015 fmt = 'f %%-%ds %%-%ds %%s' % (
3016 3016 max([len(abs) for abs in items]),
3017 3017 max([len(m.rel(abs)) for abs in items]))
3018 3018 for abs in items:
3019 3019 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
3020 3020 ui.write("%s\n" % line.rstrip())
3021 3021
3022 3022 @command('debugwireargs',
3023 3023 [('', 'three', '', 'three'),
3024 3024 ('', 'four', '', 'four'),
3025 3025 ('', 'five', '', 'five'),
3026 3026 ] + remoteopts,
3027 3027 _('REPO [OPTIONS]... [ONE [TWO]]'),
3028 3028 norepo=True)
3029 3029 def debugwireargs(ui, repopath, *vals, **opts):
3030 3030 repo = hg.peer(ui, opts, repopath)
3031 3031 for opt in remoteopts:
3032 3032 del opts[opt[1]]
3033 3033 args = {}
3034 3034 for k, v in opts.iteritems():
3035 3035 if v:
3036 3036 args[k] = v
3037 3037 # run twice to check that we don't mess up the stream for the next command
3038 3038 res1 = repo.debugwireargs(*vals, **args)
3039 3039 res2 = repo.debugwireargs(*vals, **args)
3040 3040 ui.write("%s\n" % res1)
3041 3041 if res1 != res2:
3042 3042 ui.warn("%s\n" % res2)
3043 3043
3044 3044 @command('^diff',
3045 3045 [('r', 'rev', [], _('revision'), _('REV')),
3046 3046 ('c', 'change', '', _('change made by revision'), _('REV'))
3047 3047 ] + diffopts + diffopts2 + walkopts + subrepoopts,
3048 3048 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
3049 3049 inferrepo=True)
3050 3050 def diff(ui, repo, *pats, **opts):
3051 3051 """diff repository (or selected files)
3052 3052
3053 3053 Show differences between revisions for the specified files.
3054 3054
3055 3055 Differences between files are shown using the unified diff format.
3056 3056
3057 3057 .. note::
3058 3058
3059 3059 diff may generate unexpected results for merges, as it will
3060 3060 default to comparing against the working directory's first
3061 3061 parent changeset if no revisions are specified.
3062 3062
3063 3063 When two revision arguments are given, then changes are shown
3064 3064 between those revisions. If only one revision is specified then
3065 3065 that revision is compared to the working directory, and, when no
3066 3066 revisions are specified, the working directory files are compared
3067 3067 to its parent.
3068 3068
3069 3069 Alternatively you can specify -c/--change with a revision to see
3070 3070 the changes in that changeset relative to its first parent.
3071 3071
3072 3072 Without the -a/--text option, diff will avoid generating diffs of
3073 3073 files it detects as binary. With -a, diff will generate a diff
3074 3074 anyway, probably with undesirable results.
3075 3075
3076 3076 Use the -g/--git option to generate diffs in the git extended diff
3077 3077 format. For more information, read :hg:`help diffs`.
3078 3078
3079 3079 .. container:: verbose
3080 3080
3081 3081 Examples:
3082 3082
3083 3083 - compare a file in the current working directory to its parent::
3084 3084
3085 3085 hg diff foo.c
3086 3086
3087 3087 - compare two historical versions of a directory, with rename info::
3088 3088
3089 3089 hg diff --git -r 1.0:1.2 lib/
3090 3090
3091 3091 - get change stats relative to the last change on some date::
3092 3092
3093 3093 hg diff --stat -r "date('may 2')"
3094 3094
3095 3095 - diff all newly-added files that contain a keyword::
3096 3096
3097 3097 hg diff "set:added() and grep(GNU)"
3098 3098
3099 3099 - compare a revision and its parents::
3100 3100
3101 3101 hg diff -c 9353 # compare against first parent
3102 3102 hg diff -r 9353^:9353 # same using revset syntax
3103 3103 hg diff -r 9353^2:9353 # compare against the second parent
3104 3104
3105 3105 Returns 0 on success.
3106 3106 """
3107 3107
3108 3108 revs = opts.get('rev')
3109 3109 change = opts.get('change')
3110 3110 stat = opts.get('stat')
3111 3111 reverse = opts.get('reverse')
3112 3112
3113 3113 if revs and change:
3114 3114 msg = _('cannot specify --rev and --change at the same time')
3115 3115 raise util.Abort(msg)
3116 3116 elif change:
3117 3117 node2 = scmutil.revsingle(repo, change, None).node()
3118 3118 node1 = repo[node2].p1().node()
3119 3119 else:
3120 3120 node1, node2 = scmutil.revpair(repo, revs)
3121 3121
3122 3122 if reverse:
3123 3123 node1, node2 = node2, node1
3124 3124
3125 3125 diffopts = patch.diffallopts(ui, opts)
3126 3126 m = scmutil.match(repo[node2], pats, opts)
3127 3127 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
3128 3128 listsubrepos=opts.get('subrepos'))
3129 3129
3130 3130 @command('^export',
3131 3131 [('o', 'output', '',
3132 3132 _('print output to file with formatted name'), _('FORMAT')),
3133 3133 ('', 'switch-parent', None, _('diff against the second parent')),
3134 3134 ('r', 'rev', [], _('revisions to export'), _('REV')),
3135 3135 ] + diffopts,
3136 3136 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
3137 3137 def export(ui, repo, *changesets, **opts):
3138 3138 """dump the header and diffs for one or more changesets
3139 3139
3140 3140 Print the changeset header and diffs for one or more revisions.
3141 3141 If no revision is given, the parent of the working directory is used.
3142 3142
3143 3143 The information shown in the changeset header is: author, date,
3144 3144 branch name (if non-default), changeset hash, parent(s) and commit
3145 3145 comment.
3146 3146
3147 3147 .. note::
3148 3148
3149 3149 export may generate unexpected diff output for merge
3150 3150 changesets, as it will compare the merge changeset against its
3151 3151 first parent only.
3152 3152
3153 3153 Output may be to a file, in which case the name of the file is
3154 3154 given using a format string. The formatting rules are as follows:
3155 3155
3156 3156 :``%%``: literal "%" character
3157 3157 :``%H``: changeset hash (40 hexadecimal digits)
3158 3158 :``%N``: number of patches being generated
3159 3159 :``%R``: changeset revision number
3160 3160 :``%b``: basename of the exporting repository
3161 3161 :``%h``: short-form changeset hash (12 hexadecimal digits)
3162 3162 :``%m``: first line of the commit message (only alphanumeric characters)
3163 3163 :``%n``: zero-padded sequence number, starting at 1
3164 3164 :``%r``: zero-padded changeset revision number
3165 3165
3166 3166 Without the -a/--text option, export will avoid generating diffs
3167 3167 of files it detects as binary. With -a, export will generate a
3168 3168 diff anyway, probably with undesirable results.
3169 3169
3170 3170 Use the -g/--git option to generate diffs in the git extended diff
3171 3171 format. See :hg:`help diffs` for more information.
3172 3172
3173 3173 With the --switch-parent option, the diff will be against the
3174 3174 second parent. It can be useful to review a merge.
3175 3175
3176 3176 .. container:: verbose
3177 3177
3178 3178 Examples:
3179 3179
3180 3180 - use export and import to transplant a bugfix to the current
3181 3181 branch::
3182 3182
3183 3183 hg export -r 9353 | hg import -
3184 3184
3185 3185 - export all the changesets between two revisions to a file with
3186 3186 rename information::
3187 3187
3188 3188 hg export --git -r 123:150 > changes.txt
3189 3189
3190 3190 - split outgoing changes into a series of patches with
3191 3191 descriptive names::
3192 3192
3193 3193 hg export -r "outgoing()" -o "%n-%m.patch"
3194 3194
3195 3195 Returns 0 on success.
3196 3196 """
3197 3197 changesets += tuple(opts.get('rev', []))
3198 3198 if not changesets:
3199 3199 changesets = ['.']
3200 3200 revs = scmutil.revrange(repo, changesets)
3201 3201 if not revs:
3202 3202 raise util.Abort(_("export requires at least one changeset"))
3203 3203 if len(revs) > 1:
3204 3204 ui.note(_('exporting patches:\n'))
3205 3205 else:
3206 3206 ui.note(_('exporting patch:\n'))
3207 3207 cmdutil.export(repo, revs, template=opts.get('output'),
3208 3208 switch_parent=opts.get('switch_parent'),
3209 3209 opts=patch.diffallopts(ui, opts))
3210 3210
3211 3211 @command('files',
3212 3212 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3213 3213 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3214 3214 ] + walkopts + formatteropts,
3215 3215 _('[OPTION]... [PATTERN]...'))
3216 3216 def files(ui, repo, *pats, **opts):
3217 3217 """list tracked files
3218 3218
3219 3219 Print files under Mercurial control in the working directory or
3220 3220 specified revision whose names match the given patterns (excluding
3221 3221 removed files).
3222 3222
3223 3223 If no patterns are given to match, this command prints the names
3224 3224 of all files under Mercurial control in the working copy.
3225 3225
3226 3226 .. container:: verbose
3227 3227
3228 3228 Examples:
3229 3229
3230 3230 - list all files under the current directory::
3231 3231
3232 3232 hg files .
3233 3233
3234 3234 - shows sizes and flags for current revision::
3235 3235
3236 3236 hg files -vr .
3237 3237
3238 3238 - list all files named README::
3239 3239
3240 3240 hg files -I "**/README"
3241 3241
3242 3242 - list all binary files::
3243 3243
3244 3244 hg files "set:binary()"
3245 3245
3246 3246 - find files containing a regular expression::
3247 3247
3248 3248 hg files "set:grep('bob')"
3249 3249
3250 3250 - search tracked file contents with xargs and grep::
3251 3251
3252 3252 hg files -0 | xargs -0 grep foo
3253 3253
3254 3254 See :hg:`help patterns` and :hg:`help filesets` for more information
3255 3255 on specifying file patterns.
3256 3256
3257 3257 Returns 0 if a match is found, 1 otherwise.
3258 3258
3259 3259 """
3260 3260 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3261 3261 rev = ctx.rev()
3262 3262 ret = 1
3263 3263
3264 3264 end = '\n'
3265 3265 if opts.get('print0'):
3266 3266 end = '\0'
3267 3267 fm = ui.formatter('files', opts)
3268 3268 fmt = '%s' + end
3269 3269
3270 3270 m = scmutil.match(ctx, pats, opts)
3271 3271 ds = repo.dirstate
3272 3272 for f in ctx.matches(m):
3273 3273 if rev is None and ds[f] == 'r':
3274 3274 continue
3275 3275 fm.startitem()
3276 3276 if ui.verbose:
3277 3277 fc = ctx[f]
3278 3278 fm.write('size flags', '% 10d % 1s ', fc.size(), fc.flags())
3279 3279 fm.data(abspath=f)
3280 3280 fm.write('path', fmt, m.rel(f))
3281 3281 ret = 0
3282 3282
3283 3283 fm.end()
3284 3284
3285 3285 return ret
3286 3286
3287 3287 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
3288 3288 def forget(ui, repo, *pats, **opts):
3289 3289 """forget the specified files on the next commit
3290 3290
3291 3291 Mark the specified files so they will no longer be tracked
3292 3292 after the next commit.
3293 3293
3294 3294 This only removes files from the current branch, not from the
3295 3295 entire project history, and it does not delete them from the
3296 3296 working directory.
3297 3297
3298 3298 To undo a forget before the next commit, see :hg:`add`.
3299 3299
3300 3300 .. container:: verbose
3301 3301
3302 3302 Examples:
3303 3303
3304 3304 - forget newly-added binary files::
3305 3305
3306 3306 hg forget "set:added() and binary()"
3307 3307
3308 3308 - forget files that would be excluded by .hgignore::
3309 3309
3310 3310 hg forget "set:hgignore()"
3311 3311
3312 3312 Returns 0 on success.
3313 3313 """
3314 3314
3315 3315 if not pats:
3316 3316 raise util.Abort(_('no files specified'))
3317 3317
3318 3318 m = scmutil.match(repo[None], pats, opts)
3319 3319 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
3320 3320 return rejected and 1 or 0
3321 3321
3322 3322 @command(
3323 3323 'graft',
3324 3324 [('r', 'rev', [], _('revisions to graft'), _('REV')),
3325 3325 ('c', 'continue', False, _('resume interrupted graft')),
3326 3326 ('e', 'edit', False, _('invoke editor on commit messages')),
3327 3327 ('', 'log', None, _('append graft info to log message')),
3328 3328 ('f', 'force', False, _('force graft')),
3329 3329 ('D', 'currentdate', False,
3330 3330 _('record the current date as commit date')),
3331 3331 ('U', 'currentuser', False,
3332 3332 _('record the current user as committer'), _('DATE'))]
3333 3333 + commitopts2 + mergetoolopts + dryrunopts,
3334 3334 _('[OPTION]... [-r] REV...'))
3335 3335 def graft(ui, repo, *revs, **opts):
3336 3336 '''copy changes from other branches onto the current branch
3337 3337
3338 3338 This command uses Mercurial's merge logic to copy individual
3339 3339 changes from other branches without merging branches in the
3340 3340 history graph. This is sometimes known as 'backporting' or
3341 3341 'cherry-picking'. By default, graft will copy user, date, and
3342 3342 description from the source changesets.
3343 3343
3344 3344 Changesets that are ancestors of the current revision, that have
3345 3345 already been grafted, or that are merges will be skipped.
3346 3346
3347 3347 If --log is specified, log messages will have a comment appended
3348 3348 of the form::
3349 3349
3350 3350 (grafted from CHANGESETHASH)
3351 3351
3352 3352 If --force is specified, revisions will be grafted even if they
3353 3353 are already ancestors of or have been grafted to the destination.
3354 3354 This is useful when the revisions have since been backed out.
3355 3355
3356 3356 If a graft merge results in conflicts, the graft process is
3357 3357 interrupted so that the current merge can be manually resolved.
3358 3358 Once all conflicts are addressed, the graft process can be
3359 3359 continued with the -c/--continue option.
3360 3360
3361 3361 .. note::
3362 3362
3363 3363 The -c/--continue option does not reapply earlier options, except
3364 3364 for --force.
3365 3365
3366 3366 .. container:: verbose
3367 3367
3368 3368 Examples:
3369 3369
3370 3370 - copy a single change to the stable branch and edit its description::
3371 3371
3372 3372 hg update stable
3373 3373 hg graft --edit 9393
3374 3374
3375 3375 - graft a range of changesets with one exception, updating dates::
3376 3376
3377 3377 hg graft -D "2085::2093 and not 2091"
3378 3378
3379 3379 - continue a graft after resolving conflicts::
3380 3380
3381 3381 hg graft -c
3382 3382
3383 3383 - show the source of a grafted changeset::
3384 3384
3385 3385 hg log --debug -r .
3386 3386
3387 3387 See :hg:`help revisions` and :hg:`help revsets` for more about
3388 3388 specifying revisions.
3389 3389
3390 3390 Returns 0 on successful completion.
3391 3391 '''
3392 3392
3393 3393 revs = list(revs)
3394 3394 revs.extend(opts['rev'])
3395 3395
3396 3396 if not opts.get('user') and opts.get('currentuser'):
3397 3397 opts['user'] = ui.username()
3398 3398 if not opts.get('date') and opts.get('currentdate'):
3399 3399 opts['date'] = "%d %d" % util.makedate()
3400 3400
3401 3401 editor = cmdutil.getcommiteditor(editform='graft', **opts)
3402 3402
3403 3403 cont = False
3404 3404 if opts['continue']:
3405 3405 cont = True
3406 3406 if revs:
3407 3407 raise util.Abort(_("can't specify --continue and revisions"))
3408 3408 # read in unfinished revisions
3409 3409 try:
3410 3410 nodes = repo.vfs.read('graftstate').splitlines()
3411 3411 revs = [repo[node].rev() for node in nodes]
3412 3412 except IOError, inst:
3413 3413 if inst.errno != errno.ENOENT:
3414 3414 raise
3415 3415 raise util.Abort(_("no graft state found, can't continue"))
3416 3416 else:
3417 3417 cmdutil.checkunfinished(repo)
3418 3418 cmdutil.bailifchanged(repo)
3419 3419 if not revs:
3420 3420 raise util.Abort(_('no revisions specified'))
3421 3421 revs = scmutil.revrange(repo, revs)
3422 3422
3423 3423 skipped = set()
3424 3424 # check for merges
3425 3425 for rev in repo.revs('%ld and merge()', revs):
3426 3426 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
3427 3427 skipped.add(rev)
3428 3428 revs = [r for r in revs if r not in skipped]
3429 3429 if not revs:
3430 3430 return -1
3431 3431
3432 3432 # Don't check in the --continue case, in effect retaining --force across
3433 3433 # --continues. That's because without --force, any revisions we decided to
3434 3434 # skip would have been filtered out here, so they wouldn't have made their
3435 3435 # way to the graftstate. With --force, any revisions we would have otherwise
3436 3436 # skipped would not have been filtered out, and if they hadn't been applied
3437 3437 # already, they'd have been in the graftstate.
3438 3438 if not (cont or opts.get('force')):
3439 3439 # check for ancestors of dest branch
3440 3440 crev = repo['.'].rev()
3441 3441 ancestors = repo.changelog.ancestors([crev], inclusive=True)
3442 3442 # Cannot use x.remove(y) on smart set, this has to be a list.
3443 3443 # XXX make this lazy in the future
3444 3444 revs = list(revs)
3445 3445 # don't mutate while iterating, create a copy
3446 3446 for rev in list(revs):
3447 3447 if rev in ancestors:
3448 3448 ui.warn(_('skipping ancestor revision %d:%s\n') %
3449 3449 (rev, repo[rev]))
3450 3450 # XXX remove on list is slow
3451 3451 revs.remove(rev)
3452 3452 if not revs:
3453 3453 return -1
3454 3454
3455 3455 # analyze revs for earlier grafts
3456 3456 ids = {}
3457 3457 for ctx in repo.set("%ld", revs):
3458 3458 ids[ctx.hex()] = ctx.rev()
3459 3459 n = ctx.extra().get('source')
3460 3460 if n:
3461 3461 ids[n] = ctx.rev()
3462 3462
3463 3463 # check ancestors for earlier grafts
3464 3464 ui.debug('scanning for duplicate grafts\n')
3465 3465
3466 3466 for rev in repo.changelog.findmissingrevs(revs, [crev]):
3467 3467 ctx = repo[rev]
3468 3468 n = ctx.extra().get('source')
3469 3469 if n in ids:
3470 3470 try:
3471 3471 r = repo[n].rev()
3472 3472 except error.RepoLookupError:
3473 3473 r = None
3474 3474 if r in revs:
3475 3475 ui.warn(_('skipping revision %d:%s '
3476 3476 '(already grafted to %d:%s)\n')
3477 3477 % (r, repo[r], rev, ctx))
3478 3478 revs.remove(r)
3479 3479 elif ids[n] in revs:
3480 3480 if r is None:
3481 3481 ui.warn(_('skipping already grafted revision %d:%s '
3482 3482 '(%d:%s also has unknown origin %s)\n')
3483 3483 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
3484 3484 else:
3485 3485 ui.warn(_('skipping already grafted revision %d:%s '
3486 3486 '(%d:%s also has origin %d:%s)\n')
3487 3487 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
3488 3488 revs.remove(ids[n])
3489 3489 elif ctx.hex() in ids:
3490 3490 r = ids[ctx.hex()]
3491 3491 ui.warn(_('skipping already grafted revision %d:%s '
3492 3492 '(was grafted from %d:%s)\n') %
3493 3493 (r, repo[r], rev, ctx))
3494 3494 revs.remove(r)
3495 3495 if not revs:
3496 3496 return -1
3497 3497
3498 3498 wlock = repo.wlock()
3499 3499 try:
3500 3500 for pos, ctx in enumerate(repo.set("%ld", revs)):
3501 3501 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
3502 3502 ctx.description().split('\n', 1)[0])
3503 3503 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3504 3504 if names:
3505 3505 desc += ' (%s)' % ' '.join(names)
3506 3506 ui.status(_('grafting %s\n') % desc)
3507 3507 if opts.get('dry_run'):
3508 3508 continue
3509 3509
3510 3510 source = ctx.extra().get('source')
3511 3511 if not source:
3512 3512 source = ctx.hex()
3513 3513 extra = {'source': source}
3514 3514 user = ctx.user()
3515 3515 if opts.get('user'):
3516 3516 user = opts['user']
3517 3517 date = ctx.date()
3518 3518 if opts.get('date'):
3519 3519 date = opts['date']
3520 3520 message = ctx.description()
3521 3521 if opts.get('log'):
3522 3522 message += '\n(grafted from %s)' % ctx.hex()
3523 3523
3524 3524 # we don't merge the first commit when continuing
3525 3525 if not cont:
3526 3526 # perform the graft merge with p1(rev) as 'ancestor'
3527 3527 try:
3528 3528 # ui.forcemerge is an internal variable, do not document
3529 3529 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
3530 3530 'graft')
3531 3531 stats = mergemod.graft(repo, ctx, ctx.p1(),
3532 3532 ['local', 'graft'])
3533 3533 finally:
3534 3534 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
3535 3535 # report any conflicts
3536 3536 if stats and stats[3] > 0:
3537 3537 # write out state for --continue
3538 3538 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
3539 3539 repo.vfs.write('graftstate', ''.join(nodelines))
3540 3540 raise util.Abort(
3541 3541 _("unresolved conflicts, can't continue"),
3542 3542 hint=_('use hg resolve and hg graft --continue'))
3543 3543 else:
3544 3544 cont = False
3545 3545
3546 3546 # commit
3547 3547 node = repo.commit(text=message, user=user,
3548 3548 date=date, extra=extra, editor=editor)
3549 3549 if node is None:
3550 3550 ui.warn(
3551 3551 _('note: graft of %d:%s created no changes to commit\n') %
3552 3552 (ctx.rev(), ctx))
3553 3553 finally:
3554 3554 wlock.release()
3555 3555
3556 3556 # remove state when we complete successfully
3557 3557 if not opts.get('dry_run'):
3558 3558 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
3559 3559
3560 3560 return 0
3561 3561
3562 3562 @command('grep',
3563 3563 [('0', 'print0', None, _('end fields with NUL')),
3564 3564 ('', 'all', None, _('print all revisions that match')),
3565 3565 ('a', 'text', None, _('treat all files as text')),
3566 3566 ('f', 'follow', None,
3567 3567 _('follow changeset history,'
3568 3568 ' or file history across copies and renames')),
3569 3569 ('i', 'ignore-case', None, _('ignore case when matching')),
3570 3570 ('l', 'files-with-matches', None,
3571 3571 _('print only filenames and revisions that match')),
3572 3572 ('n', 'line-number', None, _('print matching line numbers')),
3573 3573 ('r', 'rev', [],
3574 3574 _('only search files changed within revision range'), _('REV')),
3575 3575 ('u', 'user', None, _('list the author (long with -v)')),
3576 3576 ('d', 'date', None, _('list the date (short with -q)')),
3577 3577 ] + walkopts,
3578 3578 _('[OPTION]... PATTERN [FILE]...'),
3579 3579 inferrepo=True)
3580 3580 def grep(ui, repo, pattern, *pats, **opts):
3581 3581 """search for a pattern in specified files and revisions
3582 3582
3583 3583 Search revisions of files for a regular expression.
3584 3584
3585 3585 This command behaves differently than Unix grep. It only accepts
3586 3586 Python/Perl regexps. It searches repository history, not the
3587 3587 working directory. It always prints the revision number in which a
3588 3588 match appears.
3589 3589
3590 3590 By default, grep only prints output for the first revision of a
3591 3591 file in which it finds a match. To get it to print every revision
3592 3592 that contains a change in match status ("-" for a match that
3593 3593 becomes a non-match, or "+" for a non-match that becomes a match),
3594 3594 use the --all flag.
3595 3595
3596 3596 Returns 0 if a match is found, 1 otherwise.
3597 3597 """
3598 3598 reflags = re.M
3599 3599 if opts.get('ignore_case'):
3600 3600 reflags |= re.I
3601 3601 try:
3602 3602 regexp = util.re.compile(pattern, reflags)
3603 3603 except re.error, inst:
3604 3604 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
3605 3605 return 1
3606 3606 sep, eol = ':', '\n'
3607 3607 if opts.get('print0'):
3608 3608 sep = eol = '\0'
3609 3609
3610 3610 getfile = util.lrucachefunc(repo.file)
3611 3611
3612 3612 def matchlines(body):
3613 3613 begin = 0
3614 3614 linenum = 0
3615 3615 while begin < len(body):
3616 3616 match = regexp.search(body, begin)
3617 3617 if not match:
3618 3618 break
3619 3619 mstart, mend = match.span()
3620 3620 linenum += body.count('\n', begin, mstart) + 1
3621 3621 lstart = body.rfind('\n', begin, mstart) + 1 or begin
3622 3622 begin = body.find('\n', mend) + 1 or len(body) + 1
3623 3623 lend = begin - 1
3624 3624 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
3625 3625
3626 3626 class linestate(object):
3627 3627 def __init__(self, line, linenum, colstart, colend):
3628 3628 self.line = line
3629 3629 self.linenum = linenum
3630 3630 self.colstart = colstart
3631 3631 self.colend = colend
3632 3632
3633 3633 def __hash__(self):
3634 3634 return hash((self.linenum, self.line))
3635 3635
3636 3636 def __eq__(self, other):
3637 3637 return self.line == other.line
3638 3638
3639 3639 def __iter__(self):
3640 3640 yield (self.line[:self.colstart], '')
3641 3641 yield (self.line[self.colstart:self.colend], 'grep.match')
3642 3642 rest = self.line[self.colend:]
3643 3643 while rest != '':
3644 3644 match = regexp.search(rest)
3645 3645 if not match:
3646 3646 yield (rest, '')
3647 3647 break
3648 3648 mstart, mend = match.span()
3649 3649 yield (rest[:mstart], '')
3650 3650 yield (rest[mstart:mend], 'grep.match')
3651 3651 rest = rest[mend:]
3652 3652
3653 3653 matches = {}
3654 3654 copies = {}
3655 3655 def grepbody(fn, rev, body):
3656 3656 matches[rev].setdefault(fn, [])
3657 3657 m = matches[rev][fn]
3658 3658 for lnum, cstart, cend, line in matchlines(body):
3659 3659 s = linestate(line, lnum, cstart, cend)
3660 3660 m.append(s)
3661 3661
3662 3662 def difflinestates(a, b):
3663 3663 sm = difflib.SequenceMatcher(None, a, b)
3664 3664 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
3665 3665 if tag == 'insert':
3666 3666 for i in xrange(blo, bhi):
3667 3667 yield ('+', b[i])
3668 3668 elif tag == 'delete':
3669 3669 for i in xrange(alo, ahi):
3670 3670 yield ('-', a[i])
3671 3671 elif tag == 'replace':
3672 3672 for i in xrange(alo, ahi):
3673 3673 yield ('-', a[i])
3674 3674 for i in xrange(blo, bhi):
3675 3675 yield ('+', b[i])
3676 3676
3677 3677 def display(fn, ctx, pstates, states):
3678 3678 rev = ctx.rev()
3679 3679 datefunc = ui.quiet and util.shortdate or util.datestr
3680 3680 found = False
3681 3681 @util.cachefunc
3682 3682 def binary():
3683 3683 flog = getfile(fn)
3684 3684 return util.binary(flog.read(ctx.filenode(fn)))
3685 3685
3686 3686 if opts.get('all'):
3687 3687 iter = difflinestates(pstates, states)
3688 3688 else:
3689 3689 iter = [('', l) for l in states]
3690 3690 for change, l in iter:
3691 3691 cols = [(fn, 'grep.filename'), (str(rev), 'grep.rev')]
3692 3692
3693 3693 if opts.get('line_number'):
3694 3694 cols.append((str(l.linenum), 'grep.linenumber'))
3695 3695 if opts.get('all'):
3696 3696 cols.append((change, 'grep.change'))
3697 3697 if opts.get('user'):
3698 3698 cols.append((ui.shortuser(ctx.user()), 'grep.user'))
3699 3699 if opts.get('date'):
3700 3700 cols.append((datefunc(ctx.date()), 'grep.date'))
3701 3701 for col, label in cols[:-1]:
3702 3702 ui.write(col, label=label)
3703 3703 ui.write(sep, label='grep.sep')
3704 3704 ui.write(cols[-1][0], label=cols[-1][1])
3705 3705 if not opts.get('files_with_matches'):
3706 3706 ui.write(sep, label='grep.sep')
3707 3707 if not opts.get('text') and binary():
3708 3708 ui.write(" Binary file matches")
3709 3709 else:
3710 3710 for s, label in l:
3711 3711 ui.write(s, label=label)
3712 3712 ui.write(eol)
3713 3713 found = True
3714 3714 if opts.get('files_with_matches'):
3715 3715 break
3716 3716 return found
3717 3717
3718 3718 skip = {}
3719 3719 revfiles = {}
3720 3720 matchfn = scmutil.match(repo[None], pats, opts)
3721 3721 found = False
3722 3722 follow = opts.get('follow')
3723 3723
3724 3724 def prep(ctx, fns):
3725 3725 rev = ctx.rev()
3726 3726 pctx = ctx.p1()
3727 3727 parent = pctx.rev()
3728 3728 matches.setdefault(rev, {})
3729 3729 matches.setdefault(parent, {})
3730 3730 files = revfiles.setdefault(rev, [])
3731 3731 for fn in fns:
3732 3732 flog = getfile(fn)
3733 3733 try:
3734 3734 fnode = ctx.filenode(fn)
3735 3735 except error.LookupError:
3736 3736 continue
3737 3737
3738 3738 copied = flog.renamed(fnode)
3739 3739 copy = follow and copied and copied[0]
3740 3740 if copy:
3741 3741 copies.setdefault(rev, {})[fn] = copy
3742 3742 if fn in skip:
3743 3743 if copy:
3744 3744 skip[copy] = True
3745 3745 continue
3746 3746 files.append(fn)
3747 3747
3748 3748 if fn not in matches[rev]:
3749 3749 grepbody(fn, rev, flog.read(fnode))
3750 3750
3751 3751 pfn = copy or fn
3752 3752 if pfn not in matches[parent]:
3753 3753 try:
3754 3754 fnode = pctx.filenode(pfn)
3755 3755 grepbody(pfn, parent, flog.read(fnode))
3756 3756 except error.LookupError:
3757 3757 pass
3758 3758
3759 3759 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
3760 3760 rev = ctx.rev()
3761 3761 parent = ctx.p1().rev()
3762 3762 for fn in sorted(revfiles.get(rev, [])):
3763 3763 states = matches[rev][fn]
3764 3764 copy = copies.get(rev, {}).get(fn)
3765 3765 if fn in skip:
3766 3766 if copy:
3767 3767 skip[copy] = True
3768 3768 continue
3769 3769 pstates = matches.get(parent, {}).get(copy or fn, [])
3770 3770 if pstates or states:
3771 3771 r = display(fn, ctx, pstates, states)
3772 3772 found = found or r
3773 3773 if r and not opts.get('all'):
3774 3774 skip[fn] = True
3775 3775 if copy:
3776 3776 skip[copy] = True
3777 3777 del matches[rev]
3778 3778 del revfiles[rev]
3779 3779
3780 3780 return not found
3781 3781
3782 3782 @command('heads',
3783 3783 [('r', 'rev', '',
3784 3784 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
3785 3785 ('t', 'topo', False, _('show topological heads only')),
3786 3786 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
3787 3787 ('c', 'closed', False, _('show normal and closed branch heads')),
3788 3788 ] + templateopts,
3789 3789 _('[-ct] [-r STARTREV] [REV]...'))
3790 3790 def heads(ui, repo, *branchrevs, **opts):
3791 3791 """show branch heads
3792 3792
3793 3793 With no arguments, show all open branch heads in the repository.
3794 3794 Branch heads are changesets that have no descendants on the
3795 3795 same branch. They are where development generally takes place and
3796 3796 are the usual targets for update and merge operations.
3797 3797
3798 3798 If one or more REVs are given, only open branch heads on the
3799 3799 branches associated with the specified changesets are shown. This
3800 3800 means that you can use :hg:`heads .` to see the heads on the
3801 3801 currently checked-out branch.
3802 3802
3803 3803 If -c/--closed is specified, also show branch heads marked closed
3804 3804 (see :hg:`commit --close-branch`).
3805 3805
3806 3806 If STARTREV is specified, only those heads that are descendants of
3807 3807 STARTREV will be displayed.
3808 3808
3809 3809 If -t/--topo is specified, named branch mechanics will be ignored and only
3810 3810 topological heads (changesets with no children) will be shown.
3811 3811
3812 3812 Returns 0 if matching heads are found, 1 if not.
3813 3813 """
3814 3814
3815 3815 start = None
3816 3816 if 'rev' in opts:
3817 3817 start = scmutil.revsingle(repo, opts['rev'], None).node()
3818 3818
3819 3819 if opts.get('topo'):
3820 3820 heads = [repo[h] for h in repo.heads(start)]
3821 3821 else:
3822 3822 heads = []
3823 3823 for branch in repo.branchmap():
3824 3824 heads += repo.branchheads(branch, start, opts.get('closed'))
3825 3825 heads = [repo[h] for h in heads]
3826 3826
3827 3827 if branchrevs:
3828 3828 branches = set(repo[br].branch() for br in branchrevs)
3829 3829 heads = [h for h in heads if h.branch() in branches]
3830 3830
3831 3831 if opts.get('active') and branchrevs:
3832 3832 dagheads = repo.heads(start)
3833 3833 heads = [h for h in heads if h.node() in dagheads]
3834 3834
3835 3835 if branchrevs:
3836 3836 haveheads = set(h.branch() for h in heads)
3837 3837 if branches - haveheads:
3838 3838 headless = ', '.join(b for b in branches - haveheads)
3839 3839 msg = _('no open branch heads found on branches %s')
3840 3840 if opts.get('rev'):
3841 3841 msg += _(' (started at %s)') % opts['rev']
3842 3842 ui.warn((msg + '\n') % headless)
3843 3843
3844 3844 if not heads:
3845 3845 return 1
3846 3846
3847 3847 heads = sorted(heads, key=lambda x: -x.rev())
3848 3848 displayer = cmdutil.show_changeset(ui, repo, opts)
3849 3849 for ctx in heads:
3850 3850 displayer.show(ctx)
3851 3851 displayer.close()
3852 3852
3853 3853 @command('help',
3854 3854 [('e', 'extension', None, _('show only help for extensions')),
3855 3855 ('c', 'command', None, _('show only help for commands')),
3856 3856 ('k', 'keyword', '', _('show topics matching keyword')),
3857 3857 ],
3858 3858 _('[-ec] [TOPIC]'),
3859 3859 norepo=True)
3860 3860 def help_(ui, name=None, **opts):
3861 3861 """show help for a given topic or a help overview
3862 3862
3863 3863 With no arguments, print a list of commands with short help messages.
3864 3864
3865 3865 Given a topic, extension, or command name, print help for that
3866 3866 topic.
3867 3867
3868 3868 Returns 0 if successful.
3869 3869 """
3870 3870
3871 3871 textwidth = min(ui.termwidth(), 80) - 2
3872 3872
3873 3873 keep = []
3874 3874 if ui.verbose:
3875 3875 keep.append('verbose')
3876 3876 if sys.platform.startswith('win'):
3877 3877 keep.append('windows')
3878 3878 elif sys.platform == 'OpenVMS':
3879 3879 keep.append('vms')
3880 3880 elif sys.platform == 'plan9':
3881 3881 keep.append('plan9')
3882 3882 else:
3883 3883 keep.append('unix')
3884 3884 keep.append(sys.platform.lower())
3885 3885
3886 3886 section = None
3887 3887 if name and '.' in name:
3888 3888 name, section = name.split('.', 1)
3889 3889
3890 3890 text = help.help_(ui, name, **opts)
3891 3891
3892 3892 formatted, pruned = minirst.format(text, textwidth, keep=keep,
3893 3893 section=section)
3894 3894 if section and not formatted:
3895 3895 raise util.Abort(_("help section not found"))
3896 3896
3897 3897 if 'verbose' in pruned:
3898 3898 keep.append('omitted')
3899 3899 else:
3900 3900 keep.append('notomitted')
3901 3901 formatted, pruned = minirst.format(text, textwidth, keep=keep,
3902 3902 section=section)
3903 3903 ui.write(formatted)
3904 3904
3905 3905
3906 3906 @command('identify|id',
3907 3907 [('r', 'rev', '',
3908 3908 _('identify the specified revision'), _('REV')),
3909 3909 ('n', 'num', None, _('show local revision number')),
3910 3910 ('i', 'id', None, _('show global revision id')),
3911 3911 ('b', 'branch', None, _('show branch')),
3912 3912 ('t', 'tags', None, _('show tags')),
3913 3913 ('B', 'bookmarks', None, _('show bookmarks')),
3914 3914 ] + remoteopts,
3915 3915 _('[-nibtB] [-r REV] [SOURCE]'),
3916 3916 optionalrepo=True)
3917 3917 def identify(ui, repo, source=None, rev=None,
3918 3918 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
3919 3919 """identify the working copy or specified revision
3920 3920
3921 3921 Print a summary identifying the repository state at REV using one or
3922 3922 two parent hash identifiers, followed by a "+" if the working
3923 3923 directory has uncommitted changes, the branch name (if not default),
3924 3924 a list of tags, and a list of bookmarks.
3925 3925
3926 3926 When REV is not given, print a summary of the current state of the
3927 3927 repository.
3928 3928
3929 3929 Specifying a path to a repository root or Mercurial bundle will
3930 3930 cause lookup to operate on that repository/bundle.
3931 3931
3932 3932 .. container:: verbose
3933 3933
3934 3934 Examples:
3935 3935
3936 3936 - generate a build identifier for the working directory::
3937 3937
3938 3938 hg id --id > build-id.dat
3939 3939
3940 3940 - find the revision corresponding to a tag::
3941 3941
3942 3942 hg id -n -r 1.3
3943 3943
3944 3944 - check the most recent revision of a remote repository::
3945 3945
3946 3946 hg id -r tip http://selenic.com/hg/
3947 3947
3948 3948 Returns 0 if successful.
3949 3949 """
3950 3950
3951 3951 if not repo and not source:
3952 3952 raise util.Abort(_("there is no Mercurial repository here "
3953 3953 "(.hg not found)"))
3954 3954
3955 3955 hexfunc = ui.debugflag and hex or short
3956 3956 default = not (num or id or branch or tags or bookmarks)
3957 3957 output = []
3958 3958 revs = []
3959 3959
3960 3960 if source:
3961 3961 source, branches = hg.parseurl(ui.expandpath(source))
3962 3962 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3963 3963 repo = peer.local()
3964 3964 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3965 3965
3966 3966 if not repo:
3967 3967 if num or branch or tags:
3968 3968 raise util.Abort(
3969 3969 _("can't query remote revision number, branch, or tags"))
3970 3970 if not rev and revs:
3971 3971 rev = revs[0]
3972 3972 if not rev:
3973 3973 rev = "tip"
3974 3974
3975 3975 remoterev = peer.lookup(rev)
3976 3976 if default or id:
3977 3977 output = [hexfunc(remoterev)]
3978 3978
3979 3979 def getbms():
3980 3980 bms = []
3981 3981
3982 3982 if 'bookmarks' in peer.listkeys('namespaces'):
3983 3983 hexremoterev = hex(remoterev)
3984 3984 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
3985 3985 if bmr == hexremoterev]
3986 3986
3987 3987 return sorted(bms)
3988 3988
3989 3989 if bookmarks:
3990 3990 output.extend(getbms())
3991 3991 elif default and not ui.quiet:
3992 3992 # multiple bookmarks for a single parent separated by '/'
3993 3993 bm = '/'.join(getbms())
3994 3994 if bm:
3995 3995 output.append(bm)
3996 3996 else:
3997 3997 if not rev:
3998 3998 ctx = repo[None]
3999 3999 parents = ctx.parents()
4000 4000 changed = ""
4001 4001 if default or id or num:
4002 4002 if (util.any(repo.status())
4003 4003 or util.any(ctx.sub(s).dirty() for s in ctx.substate)):
4004 4004 changed = '+'
4005 4005 if default or id:
4006 4006 output = ["%s%s" %
4007 4007 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
4008 4008 if num:
4009 4009 output.append("%s%s" %
4010 4010 ('+'.join([str(p.rev()) for p in parents]), changed))
4011 4011 else:
4012 4012 ctx = scmutil.revsingle(repo, rev)
4013 4013 if default or id:
4014 4014 output = [hexfunc(ctx.node())]
4015 4015 if num:
4016 4016 output.append(str(ctx.rev()))
4017 4017
4018 4018 if default and not ui.quiet:
4019 4019 b = ctx.branch()
4020 4020 if b != 'default':
4021 4021 output.append("(%s)" % b)
4022 4022
4023 4023 # multiple tags for a single parent separated by '/'
4024 4024 t = '/'.join(ctx.tags())
4025 4025 if t:
4026 4026 output.append(t)
4027 4027
4028 4028 # multiple bookmarks for a single parent separated by '/'
4029 4029 bm = '/'.join(ctx.bookmarks())
4030 4030 if bm:
4031 4031 output.append(bm)
4032 4032 else:
4033 4033 if branch:
4034 4034 output.append(ctx.branch())
4035 4035
4036 4036 if tags:
4037 4037 output.extend(ctx.tags())
4038 4038
4039 4039 if bookmarks:
4040 4040 output.extend(ctx.bookmarks())
4041 4041
4042 4042 ui.write("%s\n" % ' '.join(output))
4043 4043
4044 4044 @command('import|patch',
4045 4045 [('p', 'strip', 1,
4046 4046 _('directory strip option for patch. This has the same '
4047 4047 'meaning as the corresponding patch option'), _('NUM')),
4048 4048 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
4049 4049 ('e', 'edit', False, _('invoke editor on commit messages')),
4050 4050 ('f', 'force', None,
4051 4051 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
4052 4052 ('', 'no-commit', None,
4053 4053 _("don't commit, just update the working directory")),
4054 4054 ('', 'bypass', None,
4055 4055 _("apply patch without touching the working directory")),
4056 4056 ('', 'partial', None,
4057 4057 _('commit even if some hunks fail')),
4058 4058 ('', 'exact', None,
4059 4059 _('apply patch to the nodes from which it was generated')),
4060 4060 ('', 'import-branch', None,
4061 4061 _('use any branch information in patch (implied by --exact)'))] +
4062 4062 commitopts + commitopts2 + similarityopts,
4063 4063 _('[OPTION]... PATCH...'))
4064 4064 def import_(ui, repo, patch1=None, *patches, **opts):
4065 4065 """import an ordered set of patches
4066 4066
4067 4067 Import a list of patches and commit them individually (unless
4068 4068 --no-commit is specified).
4069 4069
4070 4070 Because import first applies changes to the working directory,
4071 4071 import will abort if there are outstanding changes.
4072 4072
4073 4073 You can import a patch straight from a mail message. Even patches
4074 4074 as attachments work (to use the body part, it must have type
4075 4075 text/plain or text/x-patch). From and Subject headers of email
4076 4076 message are used as default committer and commit message. All
4077 4077 text/plain body parts before first diff are added to commit
4078 4078 message.
4079 4079
4080 4080 If the imported patch was generated by :hg:`export`, user and
4081 4081 description from patch override values from message headers and
4082 4082 body. Values given on command line with -m/--message and -u/--user
4083 4083 override these.
4084 4084
4085 4085 If --exact is specified, import will set the working directory to
4086 4086 the parent of each patch before applying it, and will abort if the
4087 4087 resulting changeset has a different ID than the one recorded in
4088 4088 the patch. This may happen due to character set problems or other
4089 4089 deficiencies in the text patch format.
4090 4090
4091 4091 Use --bypass to apply and commit patches directly to the
4092 4092 repository, not touching the working directory. Without --exact,
4093 4093 patches will be applied on top of the working directory parent
4094 4094 revision.
4095 4095
4096 4096 With -s/--similarity, hg will attempt to discover renames and
4097 4097 copies in the patch in the same way as :hg:`addremove`.
4098 4098
4099 4099 Use --partial to ensure a changeset will be created from the patch
4100 4100 even if some hunks fail to apply. Hunks that fail to apply will be
4101 4101 written to a <target-file>.rej file. Conflicts can then be resolved
4102 4102 by hand before :hg:`commit --amend` is run to update the created
4103 4103 changeset. This flag exists to let people import patches that
4104 4104 partially apply without losing the associated metadata (author,
4105 4105 date, description, ...). Note that when none of the hunk applies
4106 4106 cleanly, :hg:`import --partial` will create an empty changeset,
4107 4107 importing only the patch metadata.
4108 4108
4109 4109 To read a patch from standard input, use "-" as the patch name. If
4110 4110 a URL is specified, the patch will be downloaded from it.
4111 4111 See :hg:`help dates` for a list of formats valid for -d/--date.
4112 4112
4113 4113 .. container:: verbose
4114 4114
4115 4115 Examples:
4116 4116
4117 4117 - import a traditional patch from a website and detect renames::
4118 4118
4119 4119 hg import -s 80 http://example.com/bugfix.patch
4120 4120
4121 4121 - import a changeset from an hgweb server::
4122 4122
4123 4123 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
4124 4124
4125 4125 - import all the patches in an Unix-style mbox::
4126 4126
4127 4127 hg import incoming-patches.mbox
4128 4128
4129 4129 - attempt to exactly restore an exported changeset (not always
4130 4130 possible)::
4131 4131
4132 4132 hg import --exact proposed-fix.patch
4133 4133
4134 4134 Returns 0 on success, 1 on partial success (see --partial).
4135 4135 """
4136 4136
4137 4137 if not patch1:
4138 4138 raise util.Abort(_('need at least one patch to import'))
4139 4139
4140 4140 patches = (patch1,) + patches
4141 4141
4142 4142 date = opts.get('date')
4143 4143 if date:
4144 4144 opts['date'] = util.parsedate(date)
4145 4145
4146 4146 update = not opts.get('bypass')
4147 4147 if not update and opts.get('no_commit'):
4148 4148 raise util.Abort(_('cannot use --no-commit with --bypass'))
4149 4149 try:
4150 4150 sim = float(opts.get('similarity') or 0)
4151 4151 except ValueError:
4152 4152 raise util.Abort(_('similarity must be a number'))
4153 4153 if sim < 0 or sim > 100:
4154 4154 raise util.Abort(_('similarity must be between 0 and 100'))
4155 4155 if sim and not update:
4156 4156 raise util.Abort(_('cannot use --similarity with --bypass'))
4157 4157 if opts.get('exact') and opts.get('edit'):
4158 4158 raise util.Abort(_('cannot use --exact with --edit'))
4159 4159
4160 4160 if update:
4161 4161 cmdutil.checkunfinished(repo)
4162 4162 if (opts.get('exact') or not opts.get('force')) and update:
4163 4163 cmdutil.bailifchanged(repo)
4164 4164
4165 4165 base = opts["base"]
4166 4166 wlock = lock = tr = None
4167 4167 msgs = []
4168 4168 ret = 0
4169 4169
4170 4170
4171 4171 try:
4172 4172 try:
4173 4173 wlock = repo.wlock()
4174 4174 repo.dirstate.beginparentchange()
4175 4175 if not opts.get('no_commit'):
4176 4176 lock = repo.lock()
4177 4177 tr = repo.transaction('import')
4178 4178 parents = repo.parents()
4179 4179 for patchurl in patches:
4180 4180 if patchurl == '-':
4181 4181 ui.status(_('applying patch from stdin\n'))
4182 4182 patchfile = ui.fin
4183 4183 patchurl = 'stdin' # for error message
4184 4184 else:
4185 4185 patchurl = os.path.join(base, patchurl)
4186 4186 ui.status(_('applying %s\n') % patchurl)
4187 4187 patchfile = hg.openpath(ui, patchurl)
4188 4188
4189 4189 haspatch = False
4190 4190 for hunk in patch.split(patchfile):
4191 4191 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
4192 4192 parents, opts,
4193 4193 msgs, hg.clean)
4194 4194 if msg:
4195 4195 haspatch = True
4196 4196 ui.note(msg + '\n')
4197 4197 if update or opts.get('exact'):
4198 4198 parents = repo.parents()
4199 4199 else:
4200 4200 parents = [repo[node]]
4201 4201 if rej:
4202 4202 ui.write_err(_("patch applied partially\n"))
4203 4203 ui.write_err(_("(fix the .rej files and run "
4204 4204 "`hg commit --amend`)\n"))
4205 4205 ret = 1
4206 4206 break
4207 4207
4208 4208 if not haspatch:
4209 4209 raise util.Abort(_('%s: no diffs found') % patchurl)
4210 4210
4211 4211 if tr:
4212 4212 tr.close()
4213 4213 if msgs:
4214 4214 repo.savecommitmessage('\n* * *\n'.join(msgs))
4215 4215 repo.dirstate.endparentchange()
4216 4216 return ret
4217 4217 except: # re-raises
4218 4218 # wlock.release() indirectly calls dirstate.write(): since
4219 4219 # we're crashing, we do not want to change the working dir
4220 4220 # parent after all, so make sure it writes nothing
4221 4221 repo.dirstate.invalidate()
4222 4222 raise
4223 4223 finally:
4224 4224 if tr:
4225 4225 tr.release()
4226 4226 release(lock, wlock)
4227 4227
4228 4228 @command('incoming|in',
4229 4229 [('f', 'force', None,
4230 4230 _('run even if remote repository is unrelated')),
4231 4231 ('n', 'newest-first', None, _('show newest record first')),
4232 4232 ('', 'bundle', '',
4233 4233 _('file to store the bundles into'), _('FILE')),
4234 4234 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4235 4235 ('B', 'bookmarks', False, _("compare bookmarks")),
4236 4236 ('b', 'branch', [],
4237 4237 _('a specific branch you would like to pull'), _('BRANCH')),
4238 4238 ] + logopts + remoteopts + subrepoopts,
4239 4239 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
4240 4240 def incoming(ui, repo, source="default", **opts):
4241 4241 """show new changesets found in source
4242 4242
4243 4243 Show new changesets found in the specified path/URL or the default
4244 4244 pull location. These are the changesets that would have been pulled
4245 4245 if a pull at the time you issued this command.
4246 4246
4247 4247 For remote repository, using --bundle avoids downloading the
4248 4248 changesets twice if the incoming is followed by a pull.
4249 4249
4250 4250 See pull for valid source format details.
4251 4251
4252 4252 .. container:: verbose
4253 4253
4254 4254 Examples:
4255 4255
4256 4256 - show incoming changes with patches and full description::
4257 4257
4258 4258 hg incoming -vp
4259 4259
4260 4260 - show incoming changes excluding merges, store a bundle::
4261 4261
4262 4262 hg in -vpM --bundle incoming.hg
4263 4263 hg pull incoming.hg
4264 4264
4265 4265 - briefly list changes inside a bundle::
4266 4266
4267 4267 hg in changes.hg -T "{desc|firstline}\\n"
4268 4268
4269 4269 Returns 0 if there are incoming changes, 1 otherwise.
4270 4270 """
4271 4271 if opts.get('graph'):
4272 4272 cmdutil.checkunsupportedgraphflags([], opts)
4273 4273 def display(other, chlist, displayer):
4274 4274 revdag = cmdutil.graphrevs(other, chlist, opts)
4275 4275 showparents = [ctx.node() for ctx in repo[None].parents()]
4276 4276 cmdutil.displaygraph(ui, revdag, displayer, showparents,
4277 4277 graphmod.asciiedges)
4278 4278
4279 4279 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4280 4280 return 0
4281 4281
4282 4282 if opts.get('bundle') and opts.get('subrepos'):
4283 4283 raise util.Abort(_('cannot combine --bundle and --subrepos'))
4284 4284
4285 4285 if opts.get('bookmarks'):
4286 4286 source, branches = hg.parseurl(ui.expandpath(source),
4287 4287 opts.get('branch'))
4288 4288 other = hg.peer(repo, opts, source)
4289 4289 if 'bookmarks' not in other.listkeys('namespaces'):
4290 4290 ui.warn(_("remote doesn't support bookmarks\n"))
4291 4291 return 0
4292 4292 ui.status(_('comparing with %s\n') % util.hidepassword(source))
4293 4293 return bookmarks.diff(ui, repo, other)
4294 4294
4295 4295 repo._subtoppath = ui.expandpath(source)
4296 4296 try:
4297 4297 return hg.incoming(ui, repo, source, opts)
4298 4298 finally:
4299 4299 del repo._subtoppath
4300 4300
4301 4301
4302 4302 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
4303 4303 norepo=True)
4304 4304 def init(ui, dest=".", **opts):
4305 4305 """create a new repository in the given directory
4306 4306
4307 4307 Initialize a new repository in the given directory. If the given
4308 4308 directory does not exist, it will be created.
4309 4309
4310 4310 If no directory is given, the current directory is used.
4311 4311
4312 4312 It is possible to specify an ``ssh://`` URL as the destination.
4313 4313 See :hg:`help urls` for more information.
4314 4314
4315 4315 Returns 0 on success.
4316 4316 """
4317 4317 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4318 4318
4319 4319 @command('locate',
4320 4320 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
4321 4321 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4322 4322 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
4323 4323 ] + walkopts,
4324 4324 _('[OPTION]... [PATTERN]...'))
4325 4325 def locate(ui, repo, *pats, **opts):
4326 4326 """locate files matching specific patterns (DEPRECATED)
4327 4327
4328 4328 Print files under Mercurial control in the working directory whose
4329 4329 names match the given patterns.
4330 4330
4331 4331 By default, this command searches all directories in the working
4332 4332 directory. To search just the current directory and its
4333 4333 subdirectories, use "--include .".
4334 4334
4335 4335 If no patterns are given to match, this command prints the names
4336 4336 of all files under Mercurial control in the working directory.
4337 4337
4338 4338 If you want to feed the output of this command into the "xargs"
4339 4339 command, use the -0 option to both this command and "xargs". This
4340 4340 will avoid the problem of "xargs" treating single filenames that
4341 4341 contain whitespace as multiple filenames.
4342 4342
4343 4343 See :hg:`help files` for a more versatile command.
4344 4344
4345 4345 Returns 0 if a match is found, 1 otherwise.
4346 4346 """
4347 4347 end = opts.get('print0') and '\0' or '\n'
4348 4348 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
4349 4349
4350 4350 ret = 1
4351 4351 ctx = repo[rev]
4352 4352 m = scmutil.match(ctx, pats, opts, default='relglob')
4353 4353 m.bad = lambda x, y: False
4354 4354
4355 4355 for abs in ctx.matches(m):
4356 4356 if opts.get('fullpath'):
4357 4357 ui.write(repo.wjoin(abs), end)
4358 4358 else:
4359 4359 ui.write(((pats and m.rel(abs)) or abs), end)
4360 4360 ret = 0
4361 4361
4362 4362 return ret
4363 4363
4364 4364 @command('^log|history',
4365 4365 [('f', 'follow', None,
4366 4366 _('follow changeset history, or file history across copies and renames')),
4367 4367 ('', 'follow-first', None,
4368 4368 _('only follow the first parent of merge changesets (DEPRECATED)')),
4369 4369 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
4370 4370 ('C', 'copies', None, _('show copied files')),
4371 4371 ('k', 'keyword', [],
4372 4372 _('do case-insensitive search for a given text'), _('TEXT')),
4373 4373 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
4374 4374 ('', 'removed', None, _('include revisions where files were removed')),
4375 4375 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
4376 4376 ('u', 'user', [], _('revisions committed by user'), _('USER')),
4377 4377 ('', 'only-branch', [],
4378 4378 _('show only changesets within the given named branch (DEPRECATED)'),
4379 4379 _('BRANCH')),
4380 4380 ('b', 'branch', [],
4381 4381 _('show changesets within the given named branch'), _('BRANCH')),
4382 4382 ('P', 'prune', [],
4383 4383 _('do not display revision or any of its ancestors'), _('REV')),
4384 4384 ] + logopts + walkopts,
4385 4385 _('[OPTION]... [FILE]'),
4386 4386 inferrepo=True)
4387 4387 def log(ui, repo, *pats, **opts):
4388 4388 """show revision history of entire repository or files
4389 4389
4390 4390 Print the revision history of the specified files or the entire
4391 4391 project.
4392 4392
4393 4393 If no revision range is specified, the default is ``tip:0`` unless
4394 4394 --follow is set, in which case the working directory parent is
4395 4395 used as the starting revision.
4396 4396
4397 4397 File history is shown without following rename or copy history of
4398 4398 files. Use -f/--follow with a filename to follow history across
4399 4399 renames and copies. --follow without a filename will only show
4400 4400 ancestors or descendants of the starting revision.
4401 4401
4402 4402 By default this command prints revision number and changeset id,
4403 4403 tags, non-trivial parents, user, date and time, and a summary for
4404 4404 each commit. When the -v/--verbose switch is used, the list of
4405 4405 changed files and full commit message are shown.
4406 4406
4407 4407 With --graph the revisions are shown as an ASCII art DAG with the most
4408 4408 recent changeset at the top.
4409 4409 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
4410 4410 and '+' represents a fork where the changeset from the lines below is a
4411 4411 parent of the 'o' merge on the same line.
4412 4412
4413 4413 .. note::
4414 4414
4415 4415 log -p/--patch may generate unexpected diff output for merge
4416 4416 changesets, as it will only compare the merge changeset against
4417 4417 its first parent. Also, only files different from BOTH parents
4418 4418 will appear in files:.
4419 4419
4420 4420 .. note::
4421 4421
4422 4422 for performance reasons, log FILE may omit duplicate changes
4423 4423 made on branches and will not show removals or mode changes. To
4424 4424 see all such changes, use the --removed switch.
4425 4425
4426 4426 .. container:: verbose
4427 4427
4428 4428 Some examples:
4429 4429
4430 4430 - changesets with full descriptions and file lists::
4431 4431
4432 4432 hg log -v
4433 4433
4434 4434 - changesets ancestral to the working directory::
4435 4435
4436 4436 hg log -f
4437 4437
4438 4438 - last 10 commits on the current branch::
4439 4439
4440 4440 hg log -l 10 -b .
4441 4441
4442 4442 - changesets showing all modifications of a file, including removals::
4443 4443
4444 4444 hg log --removed file.c
4445 4445
4446 4446 - all changesets that touch a directory, with diffs, excluding merges::
4447 4447
4448 4448 hg log -Mp lib/
4449 4449
4450 4450 - all revision numbers that match a keyword::
4451 4451
4452 4452 hg log -k bug --template "{rev}\\n"
4453 4453
4454 4454 - list available log templates::
4455 4455
4456 4456 hg log -T list
4457 4457
4458 4458 - check if a given changeset is included in a tagged release::
4459 4459
4460 4460 hg log -r "a21ccf and ancestor(1.9)"
4461 4461
4462 4462 - find all changesets by some user in a date range::
4463 4463
4464 4464 hg log -k alice -d "may 2008 to jul 2008"
4465 4465
4466 4466 - summary of all changesets after the last tag::
4467 4467
4468 4468 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4469 4469
4470 4470 See :hg:`help dates` for a list of formats valid for -d/--date.
4471 4471
4472 4472 See :hg:`help revisions` and :hg:`help revsets` for more about
4473 4473 specifying revisions.
4474 4474
4475 4475 See :hg:`help templates` for more about pre-packaged styles and
4476 4476 specifying custom templates.
4477 4477
4478 4478 Returns 0 on success.
4479 4479
4480 4480 """
4481 4481 if opts.get('follow') and opts.get('rev'):
4482 4482 opts['rev'] = [revset.formatspec('reverse(::%lr)', opts.get('rev'))]
4483 4483 del opts['follow']
4484 4484
4485 4485 if opts.get('graph'):
4486 4486 return cmdutil.graphlog(ui, repo, *pats, **opts)
4487 4487
4488 4488 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
4489 4489 limit = cmdutil.loglimit(opts)
4490 4490 count = 0
4491 4491
4492 4492 getrenamed = None
4493 4493 if opts.get('copies'):
4494 4494 endrev = None
4495 4495 if opts.get('rev'):
4496 4496 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
4497 4497 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
4498 4498
4499 4499 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
4500 4500 for rev in revs:
4501 4501 if count == limit:
4502 4502 break
4503 4503 ctx = repo[rev]
4504 4504 copies = None
4505 4505 if getrenamed is not None and rev:
4506 4506 copies = []
4507 4507 for fn in ctx.files():
4508 4508 rename = getrenamed(fn, rev)
4509 4509 if rename:
4510 4510 copies.append((fn, rename[0]))
4511 4511 revmatchfn = filematcher and filematcher(ctx.rev()) or None
4512 4512 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
4513 4513 if displayer.flush(rev):
4514 4514 count += 1
4515 4515
4516 4516 displayer.close()
4517 4517
4518 4518 @command('manifest',
4519 4519 [('r', 'rev', '', _('revision to display'), _('REV')),
4520 4520 ('', 'all', False, _("list files from all revisions"))]
4521 4521 + formatteropts,
4522 4522 _('[-r REV]'))
4523 4523 def manifest(ui, repo, node=None, rev=None, **opts):
4524 4524 """output the current or given revision of the project manifest
4525 4525
4526 4526 Print a list of version controlled files for the given revision.
4527 4527 If no revision is given, the first parent of the working directory
4528 4528 is used, or the null revision if no revision is checked out.
4529 4529
4530 4530 With -v, print file permissions, symlink and executable bits.
4531 4531 With --debug, print file revision hashes.
4532 4532
4533 4533 If option --all is specified, the list of all files from all revisions
4534 4534 is printed. This includes deleted and renamed files.
4535 4535
4536 4536 Returns 0 on success.
4537 4537 """
4538 4538
4539 4539 fm = ui.formatter('manifest', opts)
4540 4540
4541 4541 if opts.get('all'):
4542 4542 if rev or node:
4543 4543 raise util.Abort(_("can't specify a revision with --all"))
4544 4544
4545 4545 res = []
4546 4546 prefix = "data/"
4547 4547 suffix = ".i"
4548 4548 plen = len(prefix)
4549 4549 slen = len(suffix)
4550 4550 lock = repo.lock()
4551 4551 try:
4552 4552 for fn, b, size in repo.store.datafiles():
4553 4553 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
4554 4554 res.append(fn[plen:-slen])
4555 4555 finally:
4556 4556 lock.release()
4557 4557 for f in res:
4558 4558 fm.startitem()
4559 4559 fm.write("path", '%s\n', f)
4560 4560 fm.end()
4561 4561 return
4562 4562
4563 4563 if rev and node:
4564 4564 raise util.Abort(_("please specify just one revision"))
4565 4565
4566 4566 if not node:
4567 4567 node = rev
4568 4568
4569 4569 char = {'l': '@', 'x': '*', '': ''}
4570 4570 mode = {'l': '644', 'x': '755', '': '644'}
4571 4571 ctx = scmutil.revsingle(repo, node)
4572 4572 mf = ctx.manifest()
4573 4573 for f in ctx:
4574 4574 fm.startitem()
4575 4575 fl = ctx[f].flags()
4576 4576 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
4577 4577 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
4578 4578 fm.write('path', '%s\n', f)
4579 4579 fm.end()
4580 4580
4581 4581 @command('^merge',
4582 4582 [('f', 'force', None,
4583 4583 _('force a merge including outstanding changes (DEPRECATED)')),
4584 4584 ('r', 'rev', '', _('revision to merge'), _('REV')),
4585 4585 ('P', 'preview', None,
4586 4586 _('review revisions to merge (no merge is performed)'))
4587 4587 ] + mergetoolopts,
4588 4588 _('[-P] [-f] [[-r] REV]'))
4589 4589 def merge(ui, repo, node=None, **opts):
4590 4590 """merge another revision into working directory
4591 4591
4592 4592 The current working directory is updated with all changes made in
4593 4593 the requested revision since the last common predecessor revision.
4594 4594
4595 4595 Files that changed between either parent are marked as changed for
4596 4596 the next commit and a commit must be performed before any further
4597 4597 updates to the repository are allowed. The next commit will have
4598 4598 two parents.
4599 4599
4600 4600 ``--tool`` can be used to specify the merge tool used for file
4601 4601 merges. It overrides the HGMERGE environment variable and your
4602 4602 configuration files. See :hg:`help merge-tools` for options.
4603 4603
4604 4604 If no revision is specified, the working directory's parent is a
4605 4605 head revision, and the current branch contains exactly one other
4606 4606 head, the other head is merged with by default. Otherwise, an
4607 4607 explicit revision with which to merge with must be provided.
4608 4608
4609 4609 :hg:`resolve` must be used to resolve unresolved files.
4610 4610
4611 4611 To undo an uncommitted merge, use :hg:`update --clean .` which
4612 4612 will check out a clean copy of the original merge parent, losing
4613 4613 all changes.
4614 4614
4615 4615 Returns 0 on success, 1 if there are unresolved files.
4616 4616 """
4617 4617
4618 4618 if opts.get('rev') and node:
4619 4619 raise util.Abort(_("please specify just one revision"))
4620 4620 if not node:
4621 4621 node = opts.get('rev')
4622 4622
4623 4623 if node:
4624 4624 node = scmutil.revsingle(repo, node).node()
4625 4625
4626 4626 if not node and repo._bookmarkcurrent:
4627 4627 bmheads = repo.bookmarkheads(repo._bookmarkcurrent)
4628 4628 curhead = repo[repo._bookmarkcurrent].node()
4629 4629 if len(bmheads) == 2:
4630 4630 if curhead == bmheads[0]:
4631 4631 node = bmheads[1]
4632 4632 else:
4633 4633 node = bmheads[0]
4634 4634 elif len(bmheads) > 2:
4635 4635 raise util.Abort(_("multiple matching bookmarks to merge - "
4636 4636 "please merge with an explicit rev or bookmark"),
4637 4637 hint=_("run 'hg heads' to see all heads"))
4638 4638 elif len(bmheads) <= 1:
4639 4639 raise util.Abort(_("no matching bookmark to merge - "
4640 4640 "please merge with an explicit rev or bookmark"),
4641 4641 hint=_("run 'hg heads' to see all heads"))
4642 4642
4643 4643 if not node and not repo._bookmarkcurrent:
4644 4644 branch = repo[None].branch()
4645 4645 bheads = repo.branchheads(branch)
4646 4646 nbhs = [bh for bh in bheads if not repo[bh].bookmarks()]
4647 4647
4648 4648 if len(nbhs) > 2:
4649 4649 raise util.Abort(_("branch '%s' has %d heads - "
4650 4650 "please merge with an explicit rev")
4651 4651 % (branch, len(bheads)),
4652 4652 hint=_("run 'hg heads .' to see heads"))
4653 4653
4654 4654 parent = repo.dirstate.p1()
4655 4655 if len(nbhs) <= 1:
4656 4656 if len(bheads) > 1:
4657 4657 raise util.Abort(_("heads are bookmarked - "
4658 4658 "please merge with an explicit rev"),
4659 4659 hint=_("run 'hg heads' to see all heads"))
4660 4660 if len(repo.heads()) > 1:
4661 4661 raise util.Abort(_("branch '%s' has one head - "
4662 4662 "please merge with an explicit rev")
4663 4663 % branch,
4664 4664 hint=_("run 'hg heads' to see all heads"))
4665 4665 msg, hint = _('nothing to merge'), None
4666 4666 if parent != repo.lookup(branch):
4667 4667 hint = _("use 'hg update' instead")
4668 4668 raise util.Abort(msg, hint=hint)
4669 4669
4670 4670 if parent not in bheads:
4671 4671 raise util.Abort(_('working directory not at a head revision'),
4672 4672 hint=_("use 'hg update' or merge with an "
4673 4673 "explicit revision"))
4674 4674 if parent == nbhs[0]:
4675 4675 node = nbhs[-1]
4676 4676 else:
4677 4677 node = nbhs[0]
4678 4678
4679 4679 if opts.get('preview'):
4680 4680 # find nodes that are ancestors of p2 but not of p1
4681 4681 p1 = repo.lookup('.')
4682 4682 p2 = repo.lookup(node)
4683 4683 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4684 4684
4685 4685 displayer = cmdutil.show_changeset(ui, repo, opts)
4686 4686 for node in nodes:
4687 4687 displayer.show(repo[node])
4688 4688 displayer.close()
4689 4689 return 0
4690 4690
4691 4691 try:
4692 4692 # ui.forcemerge is an internal variable, do not document
4693 4693 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
4694 4694 return hg.merge(repo, node, force=opts.get('force'))
4695 4695 finally:
4696 4696 ui.setconfig('ui', 'forcemerge', '', 'merge')
4697 4697
4698 4698 @command('outgoing|out',
4699 4699 [('f', 'force', None, _('run even when the destination is unrelated')),
4700 4700 ('r', 'rev', [],
4701 4701 _('a changeset intended to be included in the destination'), _('REV')),
4702 4702 ('n', 'newest-first', None, _('show newest record first')),
4703 4703 ('B', 'bookmarks', False, _('compare bookmarks')),
4704 4704 ('b', 'branch', [], _('a specific branch you would like to push'),
4705 4705 _('BRANCH')),
4706 4706 ] + logopts + remoteopts + subrepoopts,
4707 4707 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
4708 4708 def outgoing(ui, repo, dest=None, **opts):
4709 4709 """show changesets not found in the destination
4710 4710
4711 4711 Show changesets not found in the specified destination repository
4712 4712 or the default push location. These are the changesets that would
4713 4713 be pushed if a push was requested.
4714 4714
4715 4715 See pull for details of valid destination formats.
4716 4716
4717 4717 Returns 0 if there are outgoing changes, 1 otherwise.
4718 4718 """
4719 4719 if opts.get('graph'):
4720 4720 cmdutil.checkunsupportedgraphflags([], opts)
4721 4721 o, other = hg._outgoing(ui, repo, dest, opts)
4722 4722 if not o:
4723 4723 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4724 4724 return
4725 4725
4726 4726 revdag = cmdutil.graphrevs(repo, o, opts)
4727 4727 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
4728 4728 showparents = [ctx.node() for ctx in repo[None].parents()]
4729 4729 cmdutil.displaygraph(ui, revdag, displayer, showparents,
4730 4730 graphmod.asciiedges)
4731 4731 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4732 4732 return 0
4733 4733
4734 4734 if opts.get('bookmarks'):
4735 4735 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4736 4736 dest, branches = hg.parseurl(dest, opts.get('branch'))
4737 4737 other = hg.peer(repo, opts, dest)
4738 4738 if 'bookmarks' not in other.listkeys('namespaces'):
4739 4739 ui.warn(_("remote doesn't support bookmarks\n"))
4740 4740 return 0
4741 4741 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
4742 4742 return bookmarks.diff(ui, other, repo)
4743 4743
4744 4744 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
4745 4745 try:
4746 4746 return hg.outgoing(ui, repo, dest, opts)
4747 4747 finally:
4748 4748 del repo._subtoppath
4749 4749
4750 4750 @command('parents',
4751 4751 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
4752 4752 ] + templateopts,
4753 4753 _('[-r REV] [FILE]'),
4754 4754 inferrepo=True)
4755 4755 def parents(ui, repo, file_=None, **opts):
4756 4756 """show the parents of the working directory or revision (DEPRECATED)
4757 4757
4758 4758 Print the working directory's parent revisions. If a revision is
4759 4759 given via -r/--rev, the parent of that revision will be printed.
4760 4760 If a file argument is given, the revision in which the file was
4761 4761 last changed (before the working directory revision or the
4762 4762 argument to --rev if given) is printed.
4763 4763
4764 4764 See :hg:`summary` and :hg:`help revsets` for related information.
4765 4765
4766 4766 Returns 0 on success.
4767 4767 """
4768 4768
4769 4769 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
4770 4770
4771 4771 if file_:
4772 4772 m = scmutil.match(ctx, (file_,), opts)
4773 4773 if m.anypats() or len(m.files()) != 1:
4774 4774 raise util.Abort(_('can only specify an explicit filename'))
4775 4775 file_ = m.files()[0]
4776 4776 filenodes = []
4777 4777 for cp in ctx.parents():
4778 4778 if not cp:
4779 4779 continue
4780 4780 try:
4781 4781 filenodes.append(cp.filenode(file_))
4782 4782 except error.LookupError:
4783 4783 pass
4784 4784 if not filenodes:
4785 4785 raise util.Abort(_("'%s' not found in manifest!") % file_)
4786 4786 p = []
4787 4787 for fn in filenodes:
4788 4788 fctx = repo.filectx(file_, fileid=fn)
4789 4789 p.append(fctx.node())
4790 4790 else:
4791 4791 p = [cp.node() for cp in ctx.parents()]
4792 4792
4793 4793 displayer = cmdutil.show_changeset(ui, repo, opts)
4794 4794 for n in p:
4795 4795 if n != nullid:
4796 4796 displayer.show(repo[n])
4797 4797 displayer.close()
4798 4798
4799 4799 @command('paths', [], _('[NAME]'), optionalrepo=True)
4800 4800 def paths(ui, repo, search=None):
4801 4801 """show aliases for remote repositories
4802 4802
4803 4803 Show definition of symbolic path name NAME. If no name is given,
4804 4804 show definition of all available names.
4805 4805
4806 4806 Option -q/--quiet suppresses all output when searching for NAME
4807 4807 and shows only the path names when listing all definitions.
4808 4808
4809 4809 Path names are defined in the [paths] section of your
4810 4810 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
4811 4811 repository, ``.hg/hgrc`` is used, too.
4812 4812
4813 4813 The path names ``default`` and ``default-push`` have a special
4814 4814 meaning. When performing a push or pull operation, they are used
4815 4815 as fallbacks if no location is specified on the command-line.
4816 4816 When ``default-push`` is set, it will be used for push and
4817 4817 ``default`` will be used for pull; otherwise ``default`` is used
4818 4818 as the fallback for both. When cloning a repository, the clone
4819 4819 source is written as ``default`` in ``.hg/hgrc``. Note that
4820 4820 ``default`` and ``default-push`` apply to all inbound (e.g.
4821 4821 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and
4822 4822 :hg:`bundle`) operations.
4823 4823
4824 4824 See :hg:`help urls` for more information.
4825 4825
4826 4826 Returns 0 on success.
4827 4827 """
4828 4828 if search:
4829 4829 for name, path in ui.configitems("paths"):
4830 4830 if name == search:
4831 4831 ui.status("%s\n" % util.hidepassword(path))
4832 4832 return
4833 4833 if not ui.quiet:
4834 4834 ui.warn(_("not found!\n"))
4835 4835 return 1
4836 4836 else:
4837 4837 for name, path in ui.configitems("paths"):
4838 4838 if ui.quiet:
4839 4839 ui.write("%s\n" % name)
4840 4840 else:
4841 4841 ui.write("%s = %s\n" % (name, util.hidepassword(path)))
4842 4842
4843 4843 @command('phase',
4844 4844 [('p', 'public', False, _('set changeset phase to public')),
4845 4845 ('d', 'draft', False, _('set changeset phase to draft')),
4846 4846 ('s', 'secret', False, _('set changeset phase to secret')),
4847 4847 ('f', 'force', False, _('allow to move boundary backward')),
4848 4848 ('r', 'rev', [], _('target revision'), _('REV')),
4849 4849 ],
4850 4850 _('[-p|-d|-s] [-f] [-r] REV...'))
4851 4851 def phase(ui, repo, *revs, **opts):
4852 4852 """set or show the current phase name
4853 4853
4854 4854 With no argument, show the phase name of specified revisions.
4855 4855
4856 4856 With one of -p/--public, -d/--draft or -s/--secret, change the
4857 4857 phase value of the specified revisions.
4858 4858
4859 4859 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
4860 4860 lower phase to an higher phase. Phases are ordered as follows::
4861 4861
4862 4862 public < draft < secret
4863 4863
4864 4864 Returns 0 on success, 1 if no phases were changed or some could not
4865 4865 be changed.
4866 4866 """
4867 4867 # search for a unique phase argument
4868 4868 targetphase = None
4869 4869 for idx, name in enumerate(phases.phasenames):
4870 4870 if opts[name]:
4871 4871 if targetphase is not None:
4872 4872 raise util.Abort(_('only one phase can be specified'))
4873 4873 targetphase = idx
4874 4874
4875 4875 # look for specified revision
4876 4876 revs = list(revs)
4877 4877 revs.extend(opts['rev'])
4878 4878 if not revs:
4879 4879 raise util.Abort(_('no revisions specified'))
4880 4880
4881 4881 revs = scmutil.revrange(repo, revs)
4882 4882
4883 4883 lock = None
4884 4884 ret = 0
4885 4885 if targetphase is None:
4886 4886 # display
4887 4887 for r in revs:
4888 4888 ctx = repo[r]
4889 4889 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
4890 4890 else:
4891 4891 tr = None
4892 4892 lock = repo.lock()
4893 4893 try:
4894 4894 tr = repo.transaction("phase")
4895 4895 # set phase
4896 4896 if not revs:
4897 4897 raise util.Abort(_('empty revision set'))
4898 4898 nodes = [repo[r].node() for r in revs]
4899 4899 # moving revision from public to draft may hide them
4900 4900 # We have to check result on an unfiltered repository
4901 4901 unfi = repo.unfiltered()
4902 4902 getphase = unfi._phasecache.phase
4903 4903 olddata = [getphase(unfi, r) for r in unfi]
4904 4904 phases.advanceboundary(repo, tr, targetphase, nodes)
4905 4905 if opts['force']:
4906 4906 phases.retractboundary(repo, tr, targetphase, nodes)
4907 4907 tr.close()
4908 4908 finally:
4909 4909 if tr is not None:
4910 4910 tr.release()
4911 4911 lock.release()
4912 4912 getphase = unfi._phasecache.phase
4913 4913 newdata = [getphase(unfi, r) for r in unfi]
4914 4914 changes = sum(newdata[r] != olddata[r] for r in unfi)
4915 4915 cl = unfi.changelog
4916 4916 rejected = [n for n in nodes
4917 4917 if newdata[cl.rev(n)] < targetphase]
4918 4918 if rejected:
4919 4919 ui.warn(_('cannot move %i changesets to a higher '
4920 4920 'phase, use --force\n') % len(rejected))
4921 4921 ret = 1
4922 4922 if changes:
4923 4923 msg = _('phase changed for %i changesets\n') % changes
4924 4924 if ret:
4925 4925 ui.status(msg)
4926 4926 else:
4927 4927 ui.note(msg)
4928 4928 else:
4929 4929 ui.warn(_('no phases changed\n'))
4930 4930 ret = 1
4931 4931 return ret
4932 4932
4933 4933 def postincoming(ui, repo, modheads, optupdate, checkout):
4934 4934 if modheads == 0:
4935 4935 return
4936 4936 if optupdate:
4937 4937 checkout, movemarkfrom = bookmarks.calculateupdate(ui, repo, checkout)
4938 4938 try:
4939 4939 ret = hg.update(repo, checkout)
4940 4940 except util.Abort, inst:
4941 4941 ui.warn(_("not updating: %s\n") % str(inst))
4942 4942 if inst.hint:
4943 4943 ui.warn(_("(%s)\n") % inst.hint)
4944 4944 return 0
4945 4945 if not ret and not checkout:
4946 4946 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
4947 4947 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
4948 4948 return ret
4949 4949 if modheads > 1:
4950 4950 currentbranchheads = len(repo.branchheads())
4951 4951 if currentbranchheads == modheads:
4952 4952 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
4953 4953 elif currentbranchheads > 1:
4954 4954 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
4955 4955 "merge)\n"))
4956 4956 else:
4957 4957 ui.status(_("(run 'hg heads' to see heads)\n"))
4958 4958 else:
4959 4959 ui.status(_("(run 'hg update' to get a working copy)\n"))
4960 4960
4961 4961 @command('^pull',
4962 4962 [('u', 'update', None,
4963 4963 _('update to new branch head if changesets were pulled')),
4964 4964 ('f', 'force', None, _('run even when remote repository is unrelated')),
4965 4965 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4966 4966 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
4967 4967 ('b', 'branch', [], _('a specific branch you would like to pull'),
4968 4968 _('BRANCH')),
4969 4969 ] + remoteopts,
4970 4970 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
4971 4971 def pull(ui, repo, source="default", **opts):
4972 4972 """pull changes from the specified source
4973 4973
4974 4974 Pull changes from a remote repository to a local one.
4975 4975
4976 4976 This finds all changes from the repository at the specified path
4977 4977 or URL and adds them to a local repository (the current one unless
4978 4978 -R is specified). By default, this does not update the copy of the
4979 4979 project in the working directory.
4980 4980
4981 4981 Use :hg:`incoming` if you want to see what would have been added
4982 4982 by a pull at the time you issued this command. If you then decide
4983 4983 to add those changes to the repository, you should use :hg:`pull
4984 4984 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
4985 4985
4986 4986 If SOURCE is omitted, the 'default' path will be used.
4987 4987 See :hg:`help urls` for more information.
4988 4988
4989 4989 Returns 0 on success, 1 if an update had unresolved files.
4990 4990 """
4991 4991 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
4992 4992 ui.status(_('pulling from %s\n') % util.hidepassword(source))
4993 4993 other = hg.peer(repo, opts, source)
4994 4994 try:
4995 4995 revs, checkout = hg.addbranchrevs(repo, other, branches,
4996 4996 opts.get('rev'))
4997 4997
4998 4998 remotebookmarks = other.listkeys('bookmarks')
4999 4999
5000 5000 if opts.get('bookmark'):
5001 5001 if not revs:
5002 5002 revs = []
5003 5003 for b in opts['bookmark']:
5004 5004 if b not in remotebookmarks:
5005 5005 raise util.Abort(_('remote bookmark %s not found!') % b)
5006 5006 revs.append(remotebookmarks[b])
5007 5007
5008 5008 if revs:
5009 5009 try:
5010 5010 revs = [other.lookup(rev) for rev in revs]
5011 5011 except error.CapabilityError:
5012 5012 err = _("other repository doesn't support revision lookup, "
5013 5013 "so a rev cannot be specified.")
5014 5014 raise util.Abort(err)
5015 5015
5016 5016 modheads = exchange.pull(repo, other, heads=revs,
5017 5017 force=opts.get('force'),
5018 5018 bookmarks=opts.get('bookmark', ())).cgresult
5019 5019 if checkout:
5020 5020 checkout = str(repo.changelog.rev(other.lookup(checkout)))
5021 5021 repo._subtoppath = source
5022 5022 try:
5023 5023 ret = postincoming(ui, repo, modheads, opts.get('update'), checkout)
5024 5024
5025 5025 finally:
5026 5026 del repo._subtoppath
5027 5027
5028 5028 finally:
5029 5029 other.close()
5030 5030 return ret
5031 5031
5032 5032 @command('^push',
5033 5033 [('f', 'force', None, _('force push')),
5034 5034 ('r', 'rev', [],
5035 5035 _('a changeset intended to be included in the destination'),
5036 5036 _('REV')),
5037 5037 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
5038 5038 ('b', 'branch', [],
5039 5039 _('a specific branch you would like to push'), _('BRANCH')),
5040 5040 ('', 'new-branch', False, _('allow pushing a new branch')),
5041 5041 ] + remoteopts,
5042 5042 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
5043 5043 def push(ui, repo, dest=None, **opts):
5044 5044 """push changes to the specified destination
5045 5045
5046 5046 Push changesets from the local repository to the specified
5047 5047 destination.
5048 5048
5049 5049 This operation is symmetrical to pull: it is identical to a pull
5050 5050 in the destination repository from the current one.
5051 5051
5052 5052 By default, push will not allow creation of new heads at the
5053 5053 destination, since multiple heads would make it unclear which head
5054 5054 to use. In this situation, it is recommended to pull and merge
5055 5055 before pushing.
5056 5056
5057 5057 Use --new-branch if you want to allow push to create a new named
5058 5058 branch that is not present at the destination. This allows you to
5059 5059 only create a new branch without forcing other changes.
5060 5060
5061 5061 .. note::
5062 5062
5063 5063 Extra care should be taken with the -f/--force option,
5064 5064 which will push all new heads on all branches, an action which will
5065 5065 almost always cause confusion for collaborators.
5066 5066
5067 5067 If -r/--rev is used, the specified revision and all its ancestors
5068 5068 will be pushed to the remote repository.
5069 5069
5070 5070 If -B/--bookmark is used, the specified bookmarked revision, its
5071 5071 ancestors, and the bookmark will be pushed to the remote
5072 5072 repository.
5073 5073
5074 5074 Please see :hg:`help urls` for important details about ``ssh://``
5075 5075 URLs. If DESTINATION is omitted, a default path will be used.
5076 5076
5077 5077 Returns 0 if push was successful, 1 if nothing to push.
5078 5078 """
5079 5079
5080 5080 if opts.get('bookmark'):
5081 5081 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
5082 5082 for b in opts['bookmark']:
5083 5083 # translate -B options to -r so changesets get pushed
5084 5084 if b in repo._bookmarks:
5085 5085 opts.setdefault('rev', []).append(b)
5086 5086 else:
5087 5087 # if we try to push a deleted bookmark, translate it to null
5088 5088 # this lets simultaneous -r, -b options continue working
5089 5089 opts.setdefault('rev', []).append("null")
5090 5090
5091 5091 dest = ui.expandpath(dest or 'default-push', dest or 'default')
5092 5092 dest, branches = hg.parseurl(dest, opts.get('branch'))
5093 5093 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
5094 5094 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
5095 5095 try:
5096 5096 other = hg.peer(repo, opts, dest)
5097 5097 except error.RepoError:
5098 5098 if dest == "default-push":
5099 5099 raise util.Abort(_("default repository not configured!"),
5100 5100 hint=_('see the "path" section in "hg help config"'))
5101 5101 else:
5102 5102 raise
5103 5103
5104 5104 if revs:
5105 5105 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
5106 5106
5107 5107 repo._subtoppath = dest
5108 5108 try:
5109 5109 # push subrepos depth-first for coherent ordering
5110 5110 c = repo['']
5111 5111 subs = c.substate # only repos that are committed
5112 5112 for s in sorted(subs):
5113 5113 result = c.sub(s).push(opts)
5114 5114 if result == 0:
5115 5115 return not result
5116 5116 finally:
5117 5117 del repo._subtoppath
5118 5118 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
5119 5119 newbranch=opts.get('new_branch'),
5120 5120 bookmarks=opts.get('bookmark', ()))
5121 5121
5122 5122 result = not pushop.cgresult
5123 5123
5124 5124 if pushop.bkresult is not None:
5125 5125 if pushop.bkresult == 2:
5126 5126 result = 2
5127 5127 elif not result and pushop.bkresult:
5128 5128 result = 2
5129 5129
5130 5130 return result
5131 5131
5132 5132 @command('recover', [])
5133 5133 def recover(ui, repo):
5134 5134 """roll back an interrupted transaction
5135 5135
5136 5136 Recover from an interrupted commit or pull.
5137 5137
5138 5138 This command tries to fix the repository status after an
5139 5139 interrupted operation. It should only be necessary when Mercurial
5140 5140 suggests it.
5141 5141
5142 5142 Returns 0 if successful, 1 if nothing to recover or verify fails.
5143 5143 """
5144 5144 if repo.recover():
5145 5145 return hg.verify(repo)
5146 5146 return 1
5147 5147
5148 5148 @command('^remove|rm',
5149 5149 [('A', 'after', None, _('record delete for missing files')),
5150 5150 ('f', 'force', None,
5151 5151 _('remove (and delete) file even if added or modified')),
5152 5152 ] + subrepoopts + walkopts,
5153 5153 _('[OPTION]... FILE...'),
5154 5154 inferrepo=True)
5155 5155 def remove(ui, repo, *pats, **opts):
5156 5156 """remove the specified files on the next commit
5157 5157
5158 5158 Schedule the indicated files for removal from the current branch.
5159 5159
5160 5160 This command schedules the files to be removed at the next commit.
5161 5161 To undo a remove before that, see :hg:`revert`. To undo added
5162 5162 files, see :hg:`forget`.
5163 5163
5164 5164 .. container:: verbose
5165 5165
5166 5166 -A/--after can be used to remove only files that have already
5167 5167 been deleted, -f/--force can be used to force deletion, and -Af
5168 5168 can be used to remove files from the next revision without
5169 5169 deleting them from the working directory.
5170 5170
5171 5171 The following table details the behavior of remove for different
5172 5172 file states (columns) and option combinations (rows). The file
5173 5173 states are Added [A], Clean [C], Modified [M] and Missing [!]
5174 5174 (as reported by :hg:`status`). The actions are Warn, Remove
5175 5175 (from branch) and Delete (from disk):
5176 5176
5177 5177 ========= == == == ==
5178 5178 opt/state A C M !
5179 5179 ========= == == == ==
5180 5180 none W RD W R
5181 5181 -f R RD RD R
5182 5182 -A W W W R
5183 5183 -Af R R R R
5184 5184 ========= == == == ==
5185 5185
5186 5186 Note that remove never deletes files in Added [A] state from the
5187 5187 working directory, not even if option --force is specified.
5188 5188
5189 5189 Returns 0 on success, 1 if any warnings encountered.
5190 5190 """
5191 5191
5192 5192 after, force = opts.get('after'), opts.get('force')
5193 5193 if not pats and not after:
5194 5194 raise util.Abort(_('no files specified'))
5195 5195
5196 5196 m = scmutil.match(repo[None], pats, opts)
5197 5197 subrepos = opts.get('subrepos')
5198 5198 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
5199 5199
5200 5200 @command('rename|move|mv',
5201 5201 [('A', 'after', None, _('record a rename that has already occurred')),
5202 5202 ('f', 'force', None, _('forcibly copy over an existing managed file')),
5203 5203 ] + walkopts + dryrunopts,
5204 5204 _('[OPTION]... SOURCE... DEST'))
5205 5205 def rename(ui, repo, *pats, **opts):
5206 5206 """rename files; equivalent of copy + remove
5207 5207
5208 5208 Mark dest as copies of sources; mark sources for deletion. If dest
5209 5209 is a directory, copies are put in that directory. If dest is a
5210 5210 file, there can only be one source.
5211 5211
5212 5212 By default, this command copies the contents of files as they
5213 5213 exist in the working directory. If invoked with -A/--after, the
5214 5214 operation is recorded, but no copying is performed.
5215 5215
5216 5216 This command takes effect at the next commit. To undo a rename
5217 5217 before that, see :hg:`revert`.
5218 5218
5219 5219 Returns 0 on success, 1 if errors are encountered.
5220 5220 """
5221 5221 wlock = repo.wlock(False)
5222 5222 try:
5223 5223 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5224 5224 finally:
5225 5225 wlock.release()
5226 5226
5227 5227 @command('resolve',
5228 5228 [('a', 'all', None, _('select all unresolved files')),
5229 5229 ('l', 'list', None, _('list state of files needing merge')),
5230 5230 ('m', 'mark', None, _('mark files as resolved')),
5231 5231 ('u', 'unmark', None, _('mark files as unresolved')),
5232 5232 ('n', 'no-status', None, _('hide status prefix'))]
5233 5233 + mergetoolopts + walkopts + formatteropts,
5234 5234 _('[OPTION]... [FILE]...'),
5235 5235 inferrepo=True)
5236 5236 def resolve(ui, repo, *pats, **opts):
5237 5237 """redo merges or set/view the merge status of files
5238 5238
5239 5239 Merges with unresolved conflicts are often the result of
5240 5240 non-interactive merging using the ``internal:merge`` configuration
5241 5241 setting, or a command-line merge tool like ``diff3``. The resolve
5242 5242 command is used to manage the files involved in a merge, after
5243 5243 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5244 5244 working directory must have two parents). See :hg:`help
5245 5245 merge-tools` for information on configuring merge tools.
5246 5246
5247 5247 The resolve command can be used in the following ways:
5248 5248
5249 5249 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
5250 5250 files, discarding any previous merge attempts. Re-merging is not
5251 5251 performed for files already marked as resolved. Use ``--all/-a``
5252 5252 to select all unresolved files. ``--tool`` can be used to specify
5253 5253 the merge tool used for the given files. It overrides the HGMERGE
5254 5254 environment variable and your configuration files. Previous file
5255 5255 contents are saved with a ``.orig`` suffix.
5256 5256
5257 5257 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5258 5258 (e.g. after having manually fixed-up the files). The default is
5259 5259 to mark all unresolved files.
5260 5260
5261 5261 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5262 5262 default is to mark all resolved files.
5263 5263
5264 5264 - :hg:`resolve -l`: list files which had or still have conflicts.
5265 5265 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5266 5266
5267 5267 Note that Mercurial will not let you commit files with unresolved
5268 5268 merge conflicts. You must use :hg:`resolve -m ...` before you can
5269 5269 commit after a conflicting merge.
5270 5270
5271 5271 Returns 0 on success, 1 if any files fail a resolve attempt.
5272 5272 """
5273 5273
5274 5274 all, mark, unmark, show, nostatus = \
5275 5275 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
5276 5276
5277 5277 if (show and (mark or unmark)) or (mark and unmark):
5278 5278 raise util.Abort(_("too many options specified"))
5279 5279 if pats and all:
5280 5280 raise util.Abort(_("can't specify --all and patterns"))
5281 5281 if not (all or pats or show or mark or unmark):
5282 5282 raise util.Abort(_('no files or directories specified'),
5283 5283 hint=('use --all to remerge all files'))
5284 5284
5285 5285 if show:
5286 5286 fm = ui.formatter('resolve', opts)
5287 5287 ms = mergemod.mergestate(repo)
5288 5288 m = scmutil.match(repo[None], pats, opts)
5289 5289 for f in ms:
5290 5290 if not m(f):
5291 5291 continue
5292 5292 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved'}[ms[f]]
5293 5293 fm.startitem()
5294 5294 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
5295 5295 fm.write('path', '%s\n', f, label=l)
5296 5296 fm.end()
5297 5297 return 0
5298 5298
5299 5299 wlock = repo.wlock()
5300 5300 try:
5301 5301 ms = mergemod.mergestate(repo)
5302 5302
5303 5303 if not (ms.active() or repo.dirstate.p2() != nullid):
5304 5304 raise util.Abort(
5305 5305 _('resolve command not applicable when not merging'))
5306 5306
5307 5307 m = scmutil.match(repo[None], pats, opts)
5308 5308 ret = 0
5309 5309 didwork = False
5310 5310
5311 5311 for f in ms:
5312 5312 if not m(f):
5313 5313 continue
5314 5314
5315 5315 didwork = True
5316 5316
5317 5317 if mark:
5318 5318 ms.mark(f, "r")
5319 5319 elif unmark:
5320 5320 ms.mark(f, "u")
5321 5321 else:
5322 5322 wctx = repo[None]
5323 5323
5324 5324 # backup pre-resolve (merge uses .orig for its own purposes)
5325 5325 a = repo.wjoin(f)
5326 5326 util.copyfile(a, a + ".resolve")
5327 5327
5328 5328 try:
5329 5329 # resolve file
5330 5330 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
5331 5331 'resolve')
5332 5332 if ms.resolve(f, wctx):
5333 5333 ret = 1
5334 5334 finally:
5335 5335 ui.setconfig('ui', 'forcemerge', '', 'resolve')
5336 5336 ms.commit()
5337 5337
5338 5338 # replace filemerge's .orig file with our resolve file
5339 5339 util.rename(a + ".resolve", a + ".orig")
5340 5340
5341 5341 ms.commit()
5342 5342
5343 5343 if not didwork and pats:
5344 5344 ui.warn(_("arguments do not match paths that need resolving\n"))
5345 5345
5346 5346 finally:
5347 5347 wlock.release()
5348 5348
5349 5349 # Nudge users into finishing an unfinished operation
5350 5350 if not list(ms.unresolved()):
5351 5351 ui.status(_('(no more unresolved files)\n'))
5352 5352
5353 5353 return ret
5354 5354
5355 5355 @command('revert',
5356 5356 [('a', 'all', None, _('revert all changes when no arguments given')),
5357 5357 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5358 5358 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
5359 5359 ('C', 'no-backup', None, _('do not save backup copies of files')),
5360 5360 ] + walkopts + dryrunopts,
5361 5361 _('[OPTION]... [-r REV] [NAME]...'))
5362 5362 def revert(ui, repo, *pats, **opts):
5363 5363 """restore files to their checkout state
5364 5364
5365 5365 .. note::
5366 5366
5367 5367 To check out earlier revisions, you should use :hg:`update REV`.
5368 5368 To cancel an uncommitted merge (and lose your changes),
5369 5369 use :hg:`update --clean .`.
5370 5370
5371 5371 With no revision specified, revert the specified files or directories
5372 5372 to the contents they had in the parent of the working directory.
5373 5373 This restores the contents of files to an unmodified
5374 5374 state and unschedules adds, removes, copies, and renames. If the
5375 5375 working directory has two parents, you must explicitly specify a
5376 5376 revision.
5377 5377
5378 5378 Using the -r/--rev or -d/--date options, revert the given files or
5379 5379 directories to their states as of a specific revision. Because
5380 5380 revert does not change the working directory parents, this will
5381 5381 cause these files to appear modified. This can be helpful to "back
5382 5382 out" some or all of an earlier change. See :hg:`backout` for a
5383 5383 related method.
5384 5384
5385 5385 Modified files are saved with a .orig suffix before reverting.
5386 5386 To disable these backups, use --no-backup.
5387 5387
5388 5388 See :hg:`help dates` for a list of formats valid for -d/--date.
5389 5389
5390 5390 Returns 0 on success.
5391 5391 """
5392 5392
5393 5393 if opts.get("date"):
5394 5394 if opts.get("rev"):
5395 5395 raise util.Abort(_("you can't specify a revision and a date"))
5396 5396 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
5397 5397
5398 5398 parent, p2 = repo.dirstate.parents()
5399 5399 if not opts.get('rev') and p2 != nullid:
5400 5400 # revert after merge is a trap for new users (issue2915)
5401 5401 raise util.Abort(_('uncommitted merge with no revision specified'),
5402 5402 hint=_('use "hg update" or see "hg help revert"'))
5403 5403
5404 5404 ctx = scmutil.revsingle(repo, opts.get('rev'))
5405 5405
5406 5406 if not pats and not opts.get('all'):
5407 5407 msg = _("no files or directories specified")
5408 5408 if p2 != nullid:
5409 5409 hint = _("uncommitted merge, use --all to discard all changes,"
5410 5410 " or 'hg update -C .' to abort the merge")
5411 5411 raise util.Abort(msg, hint=hint)
5412 5412 dirty = util.any(repo.status())
5413 5413 node = ctx.node()
5414 5414 if node != parent:
5415 5415 if dirty:
5416 5416 hint = _("uncommitted changes, use --all to discard all"
5417 5417 " changes, or 'hg update %s' to update") % ctx.rev()
5418 5418 else:
5419 5419 hint = _("use --all to revert all files,"
5420 5420 " or 'hg update %s' to update") % ctx.rev()
5421 5421 elif dirty:
5422 5422 hint = _("uncommitted changes, use --all to discard all changes")
5423 5423 else:
5424 5424 hint = _("use --all to revert all files")
5425 5425 raise util.Abort(msg, hint=hint)
5426 5426
5427 5427 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
5428 5428
5429 5429 @command('rollback', dryrunopts +
5430 5430 [('f', 'force', False, _('ignore safety measures'))])
5431 5431 def rollback(ui, repo, **opts):
5432 5432 """roll back the last transaction (DANGEROUS) (DEPRECATED)
5433 5433
5434 5434 Please use :hg:`commit --amend` instead of rollback to correct
5435 5435 mistakes in the last commit.
5436 5436
5437 5437 This command should be used with care. There is only one level of
5438 5438 rollback, and there is no way to undo a rollback. It will also
5439 5439 restore the dirstate at the time of the last transaction, losing
5440 5440 any dirstate changes since that time. This command does not alter
5441 5441 the working directory.
5442 5442
5443 5443 Transactions are used to encapsulate the effects of all commands
5444 5444 that create new changesets or propagate existing changesets into a
5445 5445 repository.
5446 5446
5447 5447 .. container:: verbose
5448 5448
5449 5449 For example, the following commands are transactional, and their
5450 5450 effects can be rolled back:
5451 5451
5452 5452 - commit
5453 5453 - import
5454 5454 - pull
5455 5455 - push (with this repository as the destination)
5456 5456 - unbundle
5457 5457
5458 5458 To avoid permanent data loss, rollback will refuse to rollback a
5459 5459 commit transaction if it isn't checked out. Use --force to
5460 5460 override this protection.
5461 5461
5462 5462 This command is not intended for use on public repositories. Once
5463 5463 changes are visible for pull by other users, rolling a transaction
5464 5464 back locally is ineffective (someone else may already have pulled
5465 5465 the changes). Furthermore, a race is possible with readers of the
5466 5466 repository; for example an in-progress pull from the repository
5467 5467 may fail if a rollback is performed.
5468 5468
5469 5469 Returns 0 on success, 1 if no rollback data is available.
5470 5470 """
5471 5471 return repo.rollback(dryrun=opts.get('dry_run'),
5472 5472 force=opts.get('force'))
5473 5473
5474 5474 @command('root', [])
5475 5475 def root(ui, repo):
5476 5476 """print the root (top) of the current working directory
5477 5477
5478 5478 Print the root directory of the current repository.
5479 5479
5480 5480 Returns 0 on success.
5481 5481 """
5482 5482 ui.write(repo.root + "\n")
5483 5483
5484 5484 @command('^serve',
5485 5485 [('A', 'accesslog', '', _('name of access log file to write to'),
5486 5486 _('FILE')),
5487 5487 ('d', 'daemon', None, _('run server in background')),
5488 5488 ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('FILE')),
5489 5489 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
5490 5490 # use string type, then we can check if something was passed
5491 5491 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
5492 5492 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
5493 5493 _('ADDR')),
5494 5494 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
5495 5495 _('PREFIX')),
5496 5496 ('n', 'name', '',
5497 5497 _('name to show in web pages (default: working directory)'), _('NAME')),
5498 5498 ('', 'web-conf', '',
5499 5499 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
5500 5500 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
5501 5501 _('FILE')),
5502 5502 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
5503 5503 ('', 'stdio', None, _('for remote clients')),
5504 5504 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
5505 5505 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
5506 5506 ('', 'style', '', _('template style to use'), _('STYLE')),
5507 5507 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
5508 5508 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
5509 5509 _('[OPTION]...'),
5510 5510 optionalrepo=True)
5511 5511 def serve(ui, repo, **opts):
5512 5512 """start stand-alone webserver
5513 5513
5514 5514 Start a local HTTP repository browser and pull server. You can use
5515 5515 this for ad-hoc sharing and browsing of repositories. It is
5516 5516 recommended to use a real web server to serve a repository for
5517 5517 longer periods of time.
5518 5518
5519 5519 Please note that the server does not implement access control.
5520 5520 This means that, by default, anybody can read from the server and
5521 5521 nobody can write to it by default. Set the ``web.allow_push``
5522 5522 option to ``*`` to allow everybody to push to the server. You
5523 5523 should use a real web server if you need to authenticate users.
5524 5524
5525 5525 By default, the server logs accesses to stdout and errors to
5526 5526 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
5527 5527 files.
5528 5528
5529 5529 To have the server choose a free port number to listen on, specify
5530 5530 a port number of 0; in this case, the server will print the port
5531 5531 number it uses.
5532 5532
5533 5533 Returns 0 on success.
5534 5534 """
5535 5535
5536 5536 if opts["stdio"] and opts["cmdserver"]:
5537 5537 raise util.Abort(_("cannot use --stdio with --cmdserver"))
5538 5538
5539 5539 if opts["stdio"]:
5540 5540 if repo is None:
5541 5541 raise error.RepoError(_("there is no Mercurial repository here"
5542 5542 " (.hg not found)"))
5543 5543 s = sshserver.sshserver(ui, repo)
5544 5544 s.serve_forever()
5545 5545
5546 5546 if opts["cmdserver"]:
5547 5547 service = commandserver.createservice(ui, repo, opts)
5548 5548 return cmdutil.service(opts, initfn=service.init, runfn=service.run)
5549 5549
5550 5550 # this way we can check if something was given in the command-line
5551 5551 if opts.get('port'):
5552 5552 opts['port'] = util.getport(opts.get('port'))
5553 5553
5554 5554 baseui = repo and repo.baseui or ui
5555 5555 optlist = ("name templates style address port prefix ipv6"
5556 5556 " accesslog errorlog certificate encoding")
5557 5557 for o in optlist.split():
5558 5558 val = opts.get(o, '')
5559 5559 if val in (None, ''): # should check against default options instead
5560 5560 continue
5561 5561 baseui.setconfig("web", o, val, 'serve')
5562 5562 if repo and repo.ui != baseui:
5563 5563 repo.ui.setconfig("web", o, val, 'serve')
5564 5564
5565 5565 o = opts.get('web_conf') or opts.get('webdir_conf')
5566 5566 if not o:
5567 5567 if not repo:
5568 5568 raise error.RepoError(_("there is no Mercurial repository"
5569 5569 " here (.hg not found)"))
5570 5570 o = repo
5571 5571
5572 5572 app = hgweb.hgweb(o, baseui=baseui)
5573 5573 service = httpservice(ui, app, opts)
5574 5574 cmdutil.service(opts, initfn=service.init, runfn=service.run)
5575 5575
5576 5576 class httpservice(object):
5577 5577 def __init__(self, ui, app, opts):
5578 5578 self.ui = ui
5579 5579 self.app = app
5580 5580 self.opts = opts
5581 5581
5582 5582 def init(self):
5583 5583 util.setsignalhandler()
5584 5584 self.httpd = hgweb_server.create_server(self.ui, self.app)
5585 5585
5586 5586 if self.opts['port'] and not self.ui.verbose:
5587 5587 return
5588 5588
5589 5589 if self.httpd.prefix:
5590 5590 prefix = self.httpd.prefix.strip('/') + '/'
5591 5591 else:
5592 5592 prefix = ''
5593 5593
5594 5594 port = ':%d' % self.httpd.port
5595 5595 if port == ':80':
5596 5596 port = ''
5597 5597
5598 5598 bindaddr = self.httpd.addr
5599 5599 if bindaddr == '0.0.0.0':
5600 5600 bindaddr = '*'
5601 5601 elif ':' in bindaddr: # IPv6
5602 5602 bindaddr = '[%s]' % bindaddr
5603 5603
5604 5604 fqaddr = self.httpd.fqaddr
5605 5605 if ':' in fqaddr:
5606 5606 fqaddr = '[%s]' % fqaddr
5607 5607 if self.opts['port']:
5608 5608 write = self.ui.status
5609 5609 else:
5610 5610 write = self.ui.write
5611 5611 write(_('listening at http://%s%s/%s (bound to %s:%d)\n') %
5612 5612 (fqaddr, port, prefix, bindaddr, self.httpd.port))
5613 5613 self.ui.flush() # avoid buffering of status message
5614 5614
5615 5615 def run(self):
5616 5616 self.httpd.serve_forever()
5617 5617
5618 5618
5619 5619 @command('^status|st',
5620 5620 [('A', 'all', None, _('show status of all files')),
5621 5621 ('m', 'modified', None, _('show only modified files')),
5622 5622 ('a', 'added', None, _('show only added files')),
5623 5623 ('r', 'removed', None, _('show only removed files')),
5624 5624 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
5625 5625 ('c', 'clean', None, _('show only files without changes')),
5626 5626 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
5627 5627 ('i', 'ignored', None, _('show only ignored files')),
5628 5628 ('n', 'no-status', None, _('hide status prefix')),
5629 5629 ('C', 'copies', None, _('show source of copied files')),
5630 5630 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5631 5631 ('', 'rev', [], _('show difference from revision'), _('REV')),
5632 5632 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
5633 5633 ] + walkopts + subrepoopts + formatteropts,
5634 5634 _('[OPTION]... [FILE]...'),
5635 5635 inferrepo=True)
5636 5636 def status(ui, repo, *pats, **opts):
5637 5637 """show changed files in the working directory
5638 5638
5639 5639 Show status of files in the repository. If names are given, only
5640 5640 files that match are shown. Files that are clean or ignored or
5641 5641 the source of a copy/move operation, are not listed unless
5642 5642 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
5643 5643 Unless options described with "show only ..." are given, the
5644 5644 options -mardu are used.
5645 5645
5646 5646 Option -q/--quiet hides untracked (unknown and ignored) files
5647 5647 unless explicitly requested with -u/--unknown or -i/--ignored.
5648 5648
5649 5649 .. note::
5650 5650
5651 5651 status may appear to disagree with diff if permissions have
5652 5652 changed or a merge has occurred. The standard diff format does
5653 5653 not report permission changes and diff only reports changes
5654 5654 relative to one merge parent.
5655 5655
5656 5656 If one revision is given, it is used as the base revision.
5657 5657 If two revisions are given, the differences between them are
5658 5658 shown. The --change option can also be used as a shortcut to list
5659 5659 the changed files of a revision from its first parent.
5660 5660
5661 5661 The codes used to show the status of files are::
5662 5662
5663 5663 M = modified
5664 5664 A = added
5665 5665 R = removed
5666 5666 C = clean
5667 5667 ! = missing (deleted by non-hg command, but still tracked)
5668 5668 ? = not tracked
5669 5669 I = ignored
5670 5670 = origin of the previous file (with --copies)
5671 5671
5672 5672 .. container:: verbose
5673 5673
5674 5674 Examples:
5675 5675
5676 5676 - show changes in the working directory relative to a
5677 5677 changeset::
5678 5678
5679 5679 hg status --rev 9353
5680 5680
5681 5681 - show all changes including copies in an existing changeset::
5682 5682
5683 5683 hg status --copies --change 9353
5684 5684
5685 5685 - get a NUL separated list of added files, suitable for xargs::
5686 5686
5687 5687 hg status -an0
5688 5688
5689 5689 Returns 0 on success.
5690 5690 """
5691 5691
5692 5692 revs = opts.get('rev')
5693 5693 change = opts.get('change')
5694 5694
5695 5695 if revs and change:
5696 5696 msg = _('cannot specify --rev and --change at the same time')
5697 5697 raise util.Abort(msg)
5698 5698 elif change:
5699 5699 node2 = scmutil.revsingle(repo, change, None).node()
5700 5700 node1 = repo[node2].p1().node()
5701 5701 else:
5702 5702 node1, node2 = scmutil.revpair(repo, revs)
5703 5703
5704 5704 cwd = (pats and repo.getcwd()) or ''
5705 5705 end = opts.get('print0') and '\0' or '\n'
5706 5706 copy = {}
5707 5707 states = 'modified added removed deleted unknown ignored clean'.split()
5708 5708 show = [k for k in states if opts.get(k)]
5709 5709 if opts.get('all'):
5710 5710 show += ui.quiet and (states[:4] + ['clean']) or states
5711 5711 if not show:
5712 5712 show = ui.quiet and states[:4] or states[:5]
5713 5713
5714 5714 stat = repo.status(node1, node2, scmutil.match(repo[node2], pats, opts),
5715 5715 'ignored' in show, 'clean' in show, 'unknown' in show,
5716 5716 opts.get('subrepos'))
5717 5717 changestates = zip(states, 'MAR!?IC', stat)
5718 5718
5719 5719 if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'):
5720 5720 copy = copies.pathcopies(repo[node1], repo[node2])
5721 5721
5722 5722 fm = ui.formatter('status', opts)
5723 5723 fmt = '%s' + end
5724 5724 showchar = not opts.get('no_status')
5725 5725
5726 5726 for state, char, files in changestates:
5727 5727 if state in show:
5728 5728 label = 'status.' + state
5729 5729 for f in files:
5730 5730 fm.startitem()
5731 5731 fm.condwrite(showchar, 'status', '%s ', char, label=label)
5732 5732 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
5733 5733 if f in copy:
5734 5734 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
5735 5735 label='status.copied')
5736 5736 fm.end()
5737 5737
5738 5738 @command('^summary|sum',
5739 5739 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
5740 5740 def summary(ui, repo, **opts):
5741 5741 """summarize working directory state
5742 5742
5743 5743 This generates a brief summary of the working directory state,
5744 5744 including parents, branch, commit status, and available updates.
5745 5745
5746 5746 With the --remote option, this will check the default paths for
5747 5747 incoming and outgoing changes. This can be time-consuming.
5748 5748
5749 5749 Returns 0 on success.
5750 5750 """
5751 5751
5752 5752 ctx = repo[None]
5753 5753 parents = ctx.parents()
5754 5754 pnode = parents[0].node()
5755 5755 marks = []
5756 5756
5757 5757 for p in parents:
5758 5758 # label with log.changeset (instead of log.parent) since this
5759 5759 # shows a working directory parent *changeset*:
5760 5760 # i18n: column positioning for "hg summary"
5761 5761 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
5762 5762 label='log.changeset changeset.%s' % p.phasestr())
5763 5763 ui.write(' '.join(p.tags()), label='log.tag')
5764 5764 if p.bookmarks():
5765 5765 marks.extend(p.bookmarks())
5766 5766 if p.rev() == -1:
5767 5767 if not len(repo):
5768 5768 ui.write(_(' (empty repository)'))
5769 5769 else:
5770 5770 ui.write(_(' (no revision checked out)'))
5771 5771 ui.write('\n')
5772 5772 if p.description():
5773 5773 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
5774 5774 label='log.summary')
5775 5775
5776 5776 branch = ctx.branch()
5777 5777 bheads = repo.branchheads(branch)
5778 5778 # i18n: column positioning for "hg summary"
5779 5779 m = _('branch: %s\n') % branch
5780 5780 if branch != 'default':
5781 5781 ui.write(m, label='log.branch')
5782 5782 else:
5783 5783 ui.status(m, label='log.branch')
5784 5784
5785 5785 if marks:
5786 5786 current = repo._bookmarkcurrent
5787 5787 # i18n: column positioning for "hg summary"
5788 5788 ui.write(_('bookmarks:'), label='log.bookmark')
5789 5789 if current is not None:
5790 5790 if current in marks:
5791 5791 ui.write(' *' + current, label='bookmarks.current')
5792 5792 marks.remove(current)
5793 5793 else:
5794 5794 ui.write(' [%s]' % current, label='bookmarks.current')
5795 5795 for m in marks:
5796 5796 ui.write(' ' + m, label='log.bookmark')
5797 5797 ui.write('\n', label='log.bookmark')
5798 5798
5799 5799 status = repo.status(unknown=True)
5800 5800
5801 5801 c = repo.dirstate.copies()
5802 5802 copied, renamed = [], []
5803 5803 for d, s in c.iteritems():
5804 5804 if s in status.removed:
5805 5805 status.removed.remove(s)
5806 5806 renamed.append(d)
5807 5807 else:
5808 5808 copied.append(d)
5809 5809 if d in status.added:
5810 5810 status.added.remove(d)
5811 5811
5812 5812 ms = mergemod.mergestate(repo)
5813 5813 unresolved = [f for f in ms if ms[f] == 'u']
5814 5814
5815 5815 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5816 5816
5817 5817 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
5818 5818 (ui.label(_('%d added'), 'status.added'), status.added),
5819 5819 (ui.label(_('%d removed'), 'status.removed'), status.removed),
5820 5820 (ui.label(_('%d renamed'), 'status.copied'), renamed),
5821 5821 (ui.label(_('%d copied'), 'status.copied'), copied),
5822 5822 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
5823 5823 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
5824 5824 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
5825 5825 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
5826 5826 t = []
5827 5827 for l, s in labels:
5828 5828 if s:
5829 5829 t.append(l % len(s))
5830 5830
5831 5831 t = ', '.join(t)
5832 5832 cleanworkdir = False
5833 5833
5834 5834 if repo.vfs.exists('updatestate'):
5835 5835 t += _(' (interrupted update)')
5836 5836 elif len(parents) > 1:
5837 5837 t += _(' (merge)')
5838 5838 elif branch != parents[0].branch():
5839 5839 t += _(' (new branch)')
5840 5840 elif (parents[0].closesbranch() and
5841 5841 pnode in repo.branchheads(branch, closed=True)):
5842 5842 t += _(' (head closed)')
5843 5843 elif not (status.modified or status.added or status.removed or renamed or
5844 5844 copied or subs):
5845 5845 t += _(' (clean)')
5846 5846 cleanworkdir = True
5847 5847 elif pnode not in bheads:
5848 5848 t += _(' (new branch head)')
5849 5849
5850 5850 if cleanworkdir:
5851 5851 # i18n: column positioning for "hg summary"
5852 5852 ui.status(_('commit: %s\n') % t.strip())
5853 5853 else:
5854 5854 # i18n: column positioning for "hg summary"
5855 5855 ui.write(_('commit: %s\n') % t.strip())
5856 5856
5857 5857 # all ancestors of branch heads - all ancestors of parent = new csets
5858 5858 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
5859 5859 bheads))
5860 5860
5861 5861 if new == 0:
5862 5862 # i18n: column positioning for "hg summary"
5863 5863 ui.status(_('update: (current)\n'))
5864 5864 elif pnode not in bheads:
5865 5865 # i18n: column positioning for "hg summary"
5866 5866 ui.write(_('update: %d new changesets (update)\n') % new)
5867 5867 else:
5868 5868 # i18n: column positioning for "hg summary"
5869 5869 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5870 5870 (new, len(bheads)))
5871 5871
5872 5872 cmdutil.summaryhooks(ui, repo)
5873 5873
5874 5874 if opts.get('remote'):
5875 5875 needsincoming, needsoutgoing = True, True
5876 5876 else:
5877 5877 needsincoming, needsoutgoing = False, False
5878 5878 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
5879 5879 if i:
5880 5880 needsincoming = True
5881 5881 if o:
5882 5882 needsoutgoing = True
5883 5883 if not needsincoming and not needsoutgoing:
5884 5884 return
5885 5885
5886 5886 def getincoming():
5887 5887 source, branches = hg.parseurl(ui.expandpath('default'))
5888 5888 sbranch = branches[0]
5889 5889 try:
5890 5890 other = hg.peer(repo, {}, source)
5891 5891 except error.RepoError:
5892 5892 if opts.get('remote'):
5893 5893 raise
5894 5894 return source, sbranch, None, None, None
5895 5895 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
5896 5896 if revs:
5897 5897 revs = [other.lookup(rev) for rev in revs]
5898 5898 ui.debug('comparing with %s\n' % util.hidepassword(source))
5899 5899 repo.ui.pushbuffer()
5900 5900 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
5901 5901 repo.ui.popbuffer()
5902 5902 return source, sbranch, other, commoninc, commoninc[1]
5903 5903
5904 5904 if needsincoming:
5905 5905 source, sbranch, sother, commoninc, incoming = getincoming()
5906 5906 else:
5907 5907 source = sbranch = sother = commoninc = incoming = None
5908 5908
5909 5909 def getoutgoing():
5910 5910 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5911 5911 dbranch = branches[0]
5912 5912 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5913 5913 if source != dest:
5914 5914 try:
5915 5915 dother = hg.peer(repo, {}, dest)
5916 5916 except error.RepoError:
5917 5917 if opts.get('remote'):
5918 5918 raise
5919 5919 return dest, dbranch, None, None
5920 5920 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5921 5921 elif sother is None:
5922 5922 # there is no explicit destination peer, but source one is invalid
5923 5923 return dest, dbranch, None, None
5924 5924 else:
5925 5925 dother = sother
5926 5926 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5927 5927 common = None
5928 5928 else:
5929 5929 common = commoninc
5930 5930 if revs:
5931 5931 revs = [repo.lookup(rev) for rev in revs]
5932 5932 repo.ui.pushbuffer()
5933 5933 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
5934 5934 commoninc=common)
5935 5935 repo.ui.popbuffer()
5936 5936 return dest, dbranch, dother, outgoing
5937 5937
5938 5938 if needsoutgoing:
5939 5939 dest, dbranch, dother, outgoing = getoutgoing()
5940 5940 else:
5941 5941 dest = dbranch = dother = outgoing = None
5942 5942
5943 5943 if opts.get('remote'):
5944 5944 t = []
5945 5945 if incoming:
5946 5946 t.append(_('1 or more incoming'))
5947 5947 o = outgoing.missing
5948 5948 if o:
5949 5949 t.append(_('%d outgoing') % len(o))
5950 5950 other = dother or sother
5951 5951 if 'bookmarks' in other.listkeys('namespaces'):
5952 5952 lmarks = repo.listkeys('bookmarks')
5953 5953 rmarks = other.listkeys('bookmarks')
5954 5954 diff = set(rmarks) - set(lmarks)
5955 5955 if len(diff) > 0:
5956 5956 t.append(_('%d incoming bookmarks') % len(diff))
5957 5957 diff = set(lmarks) - set(rmarks)
5958 5958 if len(diff) > 0:
5959 5959 t.append(_('%d outgoing bookmarks') % len(diff))
5960 5960
5961 5961 if t:
5962 5962 # i18n: column positioning for "hg summary"
5963 5963 ui.write(_('remote: %s\n') % (', '.join(t)))
5964 5964 else:
5965 5965 # i18n: column positioning for "hg summary"
5966 5966 ui.status(_('remote: (synced)\n'))
5967 5967
5968 5968 cmdutil.summaryremotehooks(ui, repo, opts,
5969 5969 ((source, sbranch, sother, commoninc),
5970 5970 (dest, dbranch, dother, outgoing)))
5971 5971
5972 5972 @command('tag',
5973 5973 [('f', 'force', None, _('force tag')),
5974 5974 ('l', 'local', None, _('make the tag local')),
5975 5975 ('r', 'rev', '', _('revision to tag'), _('REV')),
5976 5976 ('', 'remove', None, _('remove a tag')),
5977 5977 # -l/--local is already there, commitopts cannot be used
5978 5978 ('e', 'edit', None, _('invoke editor on commit messages')),
5979 5979 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5980 5980 ] + commitopts2,
5981 5981 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5982 5982 def tag(ui, repo, name1, *names, **opts):
5983 5983 """add one or more tags for the current or given revision
5984 5984
5985 5985 Name a particular revision using <name>.
5986 5986
5987 5987 Tags are used to name particular revisions of the repository and are
5988 5988 very useful to compare different revisions, to go back to significant
5989 5989 earlier versions or to mark branch points as releases, etc. Changing
5990 5990 an existing tag is normally disallowed; use -f/--force to override.
5991 5991
5992 5992 If no revision is given, the parent of the working directory is
5993 5993 used.
5994 5994
5995 5995 To facilitate version control, distribution, and merging of tags,
5996 5996 they are stored as a file named ".hgtags" which is managed similarly
5997 5997 to other project files and can be hand-edited if necessary. This
5998 5998 also means that tagging creates a new commit. The file
5999 5999 ".hg/localtags" is used for local tags (not shared among
6000 6000 repositories).
6001 6001
6002 6002 Tag commits are usually made at the head of a branch. If the parent
6003 6003 of the working directory is not a branch head, :hg:`tag` aborts; use
6004 6004 -f/--force to force the tag commit to be based on a non-head
6005 6005 changeset.
6006 6006
6007 6007 See :hg:`help dates` for a list of formats valid for -d/--date.
6008 6008
6009 6009 Since tag names have priority over branch names during revision
6010 6010 lookup, using an existing branch name as a tag name is discouraged.
6011 6011
6012 6012 Returns 0 on success.
6013 6013 """
6014 6014 wlock = lock = None
6015 6015 try:
6016 6016 wlock = repo.wlock()
6017 6017 lock = repo.lock()
6018 6018 rev_ = "."
6019 6019 names = [t.strip() for t in (name1,) + names]
6020 6020 if len(names) != len(set(names)):
6021 6021 raise util.Abort(_('tag names must be unique'))
6022 6022 for n in names:
6023 6023 scmutil.checknewlabel(repo, n, 'tag')
6024 6024 if not n:
6025 6025 raise util.Abort(_('tag names cannot consist entirely of '
6026 6026 'whitespace'))
6027 6027 if opts.get('rev') and opts.get('remove'):
6028 6028 raise util.Abort(_("--rev and --remove are incompatible"))
6029 6029 if opts.get('rev'):
6030 6030 rev_ = opts['rev']
6031 6031 message = opts.get('message')
6032 6032 if opts.get('remove'):
6033 6033 expectedtype = opts.get('local') and 'local' or 'global'
6034 6034 for n in names:
6035 6035 if not repo.tagtype(n):
6036 6036 raise util.Abort(_("tag '%s' does not exist") % n)
6037 6037 if repo.tagtype(n) != expectedtype:
6038 6038 if expectedtype == 'global':
6039 6039 raise util.Abort(_("tag '%s' is not a global tag") % n)
6040 6040 else:
6041 6041 raise util.Abort(_("tag '%s' is not a local tag") % n)
6042 6042 rev_ = nullid
6043 6043 if not message:
6044 6044 # we don't translate commit messages
6045 6045 message = 'Removed tag %s' % ', '.join(names)
6046 6046 elif not opts.get('force'):
6047 6047 for n in names:
6048 6048 if n in repo.tags():
6049 6049 raise util.Abort(_("tag '%s' already exists "
6050 6050 "(use -f to force)") % n)
6051 6051 if not opts.get('local'):
6052 6052 p1, p2 = repo.dirstate.parents()
6053 6053 if p2 != nullid:
6054 6054 raise util.Abort(_('uncommitted merge'))
6055 6055 bheads = repo.branchheads()
6056 6056 if not opts.get('force') and bheads and p1 not in bheads:
6057 6057 raise util.Abort(_('not at a branch head (use -f to force)'))
6058 6058 r = scmutil.revsingle(repo, rev_).node()
6059 6059
6060 6060 if not message:
6061 6061 # we don't translate commit messages
6062 6062 message = ('Added tag %s for changeset %s' %
6063 6063 (', '.join(names), short(r)))
6064 6064
6065 6065 date = opts.get('date')
6066 6066 if date:
6067 6067 date = util.parsedate(date)
6068 6068
6069 6069 if opts.get('remove'):
6070 6070 editform = 'tag.remove'
6071 6071 else:
6072 6072 editform = 'tag.add'
6073 6073 editor = cmdutil.getcommiteditor(editform=editform, **opts)
6074 6074
6075 6075 # don't allow tagging the null rev
6076 6076 if (not opts.get('remove') and
6077 6077 scmutil.revsingle(repo, rev_).rev() == nullrev):
6078 6078 raise util.Abort(_("cannot tag null revision"))
6079 6079
6080 6080 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
6081 6081 editor=editor)
6082 6082 finally:
6083 6083 release(lock, wlock)
6084 6084
6085 6085 @command('tags', formatteropts, '')
6086 6086 def tags(ui, repo, **opts):
6087 6087 """list repository tags
6088 6088
6089 6089 This lists both regular and local tags. When the -v/--verbose
6090 6090 switch is used, a third column "local" is printed for local tags.
6091 6091
6092 6092 Returns 0 on success.
6093 6093 """
6094 6094
6095 6095 fm = ui.formatter('tags', opts)
6096 6096 hexfunc = fm.hexfunc
6097 6097 tagtype = ""
6098 6098
6099 6099 for t, n in reversed(repo.tagslist()):
6100 6100 hn = hexfunc(n)
6101 6101 label = 'tags.normal'
6102 6102 tagtype = ''
6103 6103 if repo.tagtype(t) == 'local':
6104 6104 label = 'tags.local'
6105 6105 tagtype = 'local'
6106 6106
6107 6107 fm.startitem()
6108 6108 fm.write('tag', '%s', t, label=label)
6109 6109 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
6110 6110 fm.condwrite(not ui.quiet, 'rev node', fmt,
6111 6111 repo.changelog.rev(n), hn, label=label)
6112 6112 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
6113 6113 tagtype, label=label)
6114 6114 fm.plain('\n')
6115 6115 fm.end()
6116 6116
6117 6117 @command('tip',
6118 6118 [('p', 'patch', None, _('show patch')),
6119 6119 ('g', 'git', None, _('use git extended diff format')),
6120 6120 ] + templateopts,
6121 6121 _('[-p] [-g]'))
6122 6122 def tip(ui, repo, **opts):
6123 6123 """show the tip revision (DEPRECATED)
6124 6124
6125 6125 The tip revision (usually just called the tip) is the changeset
6126 6126 most recently added to the repository (and therefore the most
6127 6127 recently changed head).
6128 6128
6129 6129 If you have just made a commit, that commit will be the tip. If
6130 6130 you have just pulled changes from another repository, the tip of
6131 6131 that repository becomes the current tip. The "tip" tag is special
6132 6132 and cannot be renamed or assigned to a different changeset.
6133 6133
6134 6134 This command is deprecated, please use :hg:`heads` instead.
6135 6135
6136 6136 Returns 0 on success.
6137 6137 """
6138 6138 displayer = cmdutil.show_changeset(ui, repo, opts)
6139 6139 displayer.show(repo['tip'])
6140 6140 displayer.close()
6141 6141
6142 6142 @command('unbundle',
6143 6143 [('u', 'update', None,
6144 6144 _('update to new branch head if changesets were unbundled'))],
6145 6145 _('[-u] FILE...'))
6146 6146 def unbundle(ui, repo, fname1, *fnames, **opts):
6147 6147 """apply one or more changegroup files
6148 6148
6149 6149 Apply one or more compressed changegroup files generated by the
6150 6150 bundle command.
6151 6151
6152 6152 Returns 0 on success, 1 if an update has unresolved files.
6153 6153 """
6154 6154 fnames = (fname1,) + fnames
6155 6155
6156 6156 lock = repo.lock()
6157 6157 try:
6158 6158 for fname in fnames:
6159 6159 f = hg.openpath(ui, fname)
6160 6160 gen = exchange.readbundle(ui, f, fname)
6161 6161 if isinstance(gen, bundle2.unbundle20):
6162 6162 tr = repo.transaction('unbundle')
6163 6163 try:
6164 6164 op = bundle2.processbundle(repo, gen, lambda: tr)
6165 6165 tr.close()
6166 6166 finally:
6167 6167 if tr:
6168 6168 tr.release()
6169 6169 changes = [r.get('result', 0)
6170 6170 for r in op.records['changegroup']]
6171 6171 modheads = changegroup.combineresults(changes)
6172 6172 else:
6173 6173 modheads = changegroup.addchangegroup(repo, gen, 'unbundle',
6174 6174 'bundle:' + fname)
6175 6175 finally:
6176 6176 lock.release()
6177 6177
6178 6178 return postincoming(ui, repo, modheads, opts.get('update'), None)
6179 6179
6180 6180 @command('^update|up|checkout|co',
6181 6181 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
6182 6182 ('c', 'check', None,
6183 6183 _('update across branches if no uncommitted changes')),
6184 6184 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6185 6185 ('r', 'rev', '', _('revision'), _('REV'))
6186 6186 ] + mergetoolopts,
6187 6187 _('[-c] [-C] [-d DATE] [[-r] REV]'))
6188 6188 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
6189 6189 tool=None):
6190 6190 """update working directory (or switch revisions)
6191 6191
6192 6192 Update the repository's working directory to the specified
6193 6193 changeset. If no changeset is specified, update to the tip of the
6194 6194 current named branch and move the current bookmark (see :hg:`help
6195 6195 bookmarks`).
6196 6196
6197 6197 Update sets the working directory's parent revision to the specified
6198 6198 changeset (see :hg:`help parents`).
6199 6199
6200 6200 If the changeset is not a descendant or ancestor of the working
6201 6201 directory's parent, the update is aborted. With the -c/--check
6202 6202 option, the working directory is checked for uncommitted changes; if
6203 6203 none are found, the working directory is updated to the specified
6204 6204 changeset.
6205 6205
6206 6206 .. container:: verbose
6207 6207
6208 6208 The following rules apply when the working directory contains
6209 6209 uncommitted changes:
6210 6210
6211 6211 1. If neither -c/--check nor -C/--clean is specified, and if
6212 6212 the requested changeset is an ancestor or descendant of
6213 6213 the working directory's parent, the uncommitted changes
6214 6214 are merged into the requested changeset and the merged
6215 6215 result is left uncommitted. If the requested changeset is
6216 6216 not an ancestor or descendant (that is, it is on another
6217 6217 branch), the update is aborted and the uncommitted changes
6218 6218 are preserved.
6219 6219
6220 6220 2. With the -c/--check option, the update is aborted and the
6221 6221 uncommitted changes are preserved.
6222 6222
6223 6223 3. With the -C/--clean option, uncommitted changes are discarded and
6224 6224 the working directory is updated to the requested changeset.
6225 6225
6226 6226 To cancel an uncommitted merge (and lose your changes), use
6227 6227 :hg:`update --clean .`.
6228 6228
6229 6229 Use null as the changeset to remove the working directory (like
6230 6230 :hg:`clone -U`).
6231 6231
6232 6232 If you want to revert just one file to an older revision, use
6233 6233 :hg:`revert [-r REV] NAME`.
6234 6234
6235 6235 See :hg:`help dates` for a list of formats valid for -d/--date.
6236 6236
6237 6237 Returns 0 on success, 1 if there are unresolved files.
6238 6238 """
6239 6239 if rev and node:
6240 6240 raise util.Abort(_("please specify just one revision"))
6241 6241
6242 6242 if rev is None or rev == '':
6243 6243 rev = node
6244 6244
6245 6245 cmdutil.clearunfinished(repo)
6246 6246
6247 6247 # with no argument, we also move the current bookmark, if any
6248 6248 rev, movemarkfrom = bookmarks.calculateupdate(ui, repo, rev)
6249 6249
6250 6250 # if we defined a bookmark, we have to remember the original bookmark name
6251 6251 brev = rev
6252 6252 rev = scmutil.revsingle(repo, rev, rev).rev()
6253 6253
6254 6254 if check and clean:
6255 6255 raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))
6256 6256
6257 6257 if date:
6258 6258 if rev is not None:
6259 6259 raise util.Abort(_("you can't specify a revision and a date"))
6260 6260 rev = cmdutil.finddate(ui, repo, date)
6261 6261
6262 6262 if check:
6263 6263 c = repo[None]
6264 6264 if c.dirty(merge=False, branch=False, missing=True):
6265 6265 raise util.Abort(_("uncommitted changes"))
6266 6266 if rev is None:
6267 6267 rev = repo[repo[None].branch()].rev()
6268 6268
6269 6269 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
6270 6270
6271 6271 if clean:
6272 6272 ret = hg.clean(repo, rev)
6273 6273 else:
6274 6274 ret = hg.update(repo, rev)
6275 6275
6276 6276 if not ret and movemarkfrom:
6277 6277 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
6278 6278 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
6279 6279 elif brev in repo._bookmarks:
6280 6280 bookmarks.setcurrent(repo, brev)
6281 6281 ui.status(_("(activating bookmark %s)\n") % brev)
6282 6282 elif brev:
6283 6283 if repo._bookmarkcurrent:
6284 6284 ui.status(_("(leaving bookmark %s)\n") %
6285 6285 repo._bookmarkcurrent)
6286 6286 bookmarks.unsetcurrent(repo)
6287 6287
6288 6288 return ret
6289 6289
6290 6290 @command('verify', [])
6291 6291 def verify(ui, repo):
6292 6292 """verify the integrity of the repository
6293 6293
6294 6294 Verify the integrity of the current repository.
6295 6295
6296 6296 This will perform an extensive check of the repository's
6297 6297 integrity, validating the hashes and checksums of each entry in
6298 6298 the changelog, manifest, and tracked files, as well as the
6299 6299 integrity of their crosslinks and indices.
6300 6300
6301 6301 Please see http://mercurial.selenic.com/wiki/RepositoryCorruption
6302 6302 for more information about recovery from corruption of the
6303 6303 repository.
6304 6304
6305 6305 Returns 0 on success, 1 if errors are encountered.
6306 6306 """
6307 6307 return hg.verify(repo)
6308 6308
6309 6309 @command('version', [], norepo=True)
6310 6310 def version_(ui):
6311 6311 """output version and copyright information"""
6312 6312 ui.write(_("Mercurial Distributed SCM (version %s)\n")
6313 6313 % util.version())
6314 6314 ui.status(_(
6315 6315 "(see http://mercurial.selenic.com for more information)\n"
6316 "\nCopyright (C) 2005-2014 Matt Mackall and others\n"
6316 "\nCopyright (C) 2005-2015 Matt Mackall and others\n"
6317 6317 "This is free software; see the source for copying conditions. "
6318 6318 "There is NO\nwarranty; "
6319 6319 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6320 6320 ))
6321 6321
6322 6322 ui.note(_("\nEnabled extensions:\n\n"))
6323 6323 if ui.verbose:
6324 6324 # format names and versions into columns
6325 6325 names = []
6326 6326 vers = []
6327 6327 for name, module in extensions.extensions():
6328 6328 names.append(name)
6329 6329 vers.append(extensions.moduleversion(module))
6330 6330 if names:
6331 6331 maxnamelen = max(len(n) for n in names)
6332 6332 for i, name in enumerate(names):
6333 6333 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: http://mercurial.selenic.com/
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-2014 Matt Mackall.
115 Copyright (C) 2005-2015 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-2014 Matt Mackall.
29 Mercurial is copyright 2005-2015 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-2014 Matt Mackall.
37 Mercurial is copyright 2005-2015 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,646 +1,646 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, 4, 0, 'final'):
9 9 raise SystemExit("Mercurial requires Python 2.4 or later.")
10 10
11 11 if sys.version_info[0] >= 3:
12 12 def b(s):
13 13 '''A helper function to emulate 2.6+ bytes literals using string
14 14 literals.'''
15 15 return s.encode('latin1')
16 16 printf = eval('print')
17 17 libdir_escape = 'unicode_escape'
18 18 else:
19 19 libdir_escape = 'string_escape'
20 20 def b(s):
21 21 '''A helper function to emulate 2.6+ bytes literals using string
22 22 literals.'''
23 23 return s
24 24 def printf(*args, **kwargs):
25 25 f = kwargs.get('file', sys.stdout)
26 26 end = kwargs.get('end', '\n')
27 27 f.write(b(' ').join(args) + end)
28 28
29 29 # Solaris Python packaging brain damage
30 30 try:
31 31 import hashlib
32 32 sha = hashlib.sha1()
33 33 except ImportError:
34 34 try:
35 35 import sha
36 36 sha.sha # silence unused import warning
37 37 except ImportError:
38 38 raise SystemExit(
39 39 "Couldn't import standard hashlib (incomplete Python install).")
40 40
41 41 try:
42 42 import zlib
43 43 zlib.compressobj # silence unused import warning
44 44 except ImportError:
45 45 raise SystemExit(
46 46 "Couldn't import standard zlib (incomplete Python install).")
47 47
48 48 # The base IronPython distribution (as of 2.7.1) doesn't support bz2
49 49 isironpython = False
50 50 try:
51 51 isironpython = (platform.python_implementation()
52 52 .lower().find("ironpython") != -1)
53 53 except AttributeError:
54 54 pass
55 55
56 56 if isironpython:
57 57 sys.stderr.write("warning: IronPython detected (no bz2 support)\n")
58 58 else:
59 59 try:
60 60 import bz2
61 61 bz2.BZ2Compressor # silence unused import warning
62 62 except ImportError:
63 63 raise SystemExit(
64 64 "Couldn't import standard bz2 (incomplete Python install).")
65 65
66 66 import os, stat, subprocess, time
67 67 import re
68 68 import shutil
69 69 import tempfile
70 70 from distutils import log
71 71 from distutils.core import setup, Command, Extension
72 72 from distutils.dist import Distribution
73 73 from distutils.command.build import build
74 74 from distutils.command.build_ext import build_ext
75 75 from distutils.command.build_py import build_py
76 76 from distutils.command.install_lib import install_lib
77 77 from distutils.command.install_scripts import install_scripts
78 78 from distutils.spawn import spawn, find_executable
79 79 from distutils import file_util
80 80 from distutils.errors import CCompilerError, DistutilsExecError
81 81 from distutils.sysconfig import get_python_inc, get_config_var
82 82 from distutils.version import StrictVersion
83 83
84 84 convert2to3 = '--c2to3' in sys.argv
85 85 if convert2to3:
86 86 try:
87 87 from distutils.command.build_py import build_py_2to3 as build_py
88 88 from lib2to3.refactor import get_fixers_from_package as getfixers
89 89 except ImportError:
90 90 if sys.version_info[0] < 3:
91 91 raise SystemExit("--c2to3 is only compatible with python3.")
92 92 raise
93 93 sys.path.append('contrib')
94 94 elif sys.version_info[0] >= 3:
95 95 raise SystemExit("setup.py with python3 needs --c2to3 (experimental)")
96 96
97 97 scripts = ['hg']
98 98 if os.name == 'nt':
99 99 scripts.append('contrib/win32/hg.bat')
100 100
101 101 # simplified version of distutils.ccompiler.CCompiler.has_function
102 102 # that actually removes its temporary files.
103 103 def hasfunction(cc, funcname):
104 104 tmpdir = tempfile.mkdtemp(prefix='hg-install-')
105 105 devnull = oldstderr = None
106 106 try:
107 107 try:
108 108 fname = os.path.join(tmpdir, 'funcname.c')
109 109 f = open(fname, 'w')
110 110 f.write('int main(void) {\n')
111 111 f.write(' %s();\n' % funcname)
112 112 f.write('}\n')
113 113 f.close()
114 114 # Redirect stderr to /dev/null to hide any error messages
115 115 # from the compiler.
116 116 # This will have to be changed if we ever have to check
117 117 # for a function on Windows.
118 118 devnull = open('/dev/null', 'w')
119 119 oldstderr = os.dup(sys.stderr.fileno())
120 120 os.dup2(devnull.fileno(), sys.stderr.fileno())
121 121 objects = cc.compile([fname], output_dir=tmpdir)
122 122 cc.link_executable(objects, os.path.join(tmpdir, "a.out"))
123 123 except Exception:
124 124 return False
125 125 return True
126 126 finally:
127 127 if oldstderr is not None:
128 128 os.dup2(oldstderr, sys.stderr.fileno())
129 129 if devnull is not None:
130 130 devnull.close()
131 131 shutil.rmtree(tmpdir)
132 132
133 133 # py2exe needs to be installed to work
134 134 try:
135 135 import py2exe
136 136 py2exe.Distribution # silence unused import warning
137 137 py2exeloaded = True
138 138 # import py2exe's patched Distribution class
139 139 from distutils.core import Distribution
140 140 except ImportError:
141 141 py2exeloaded = False
142 142
143 143 def runcmd(cmd, env):
144 144 if (sys.platform == 'plan9'
145 145 and (sys.version_info[0] == 2 and sys.version_info[1] < 7)):
146 146 # subprocess kludge to work around issues in half-baked Python
147 147 # ports, notably bichued/python:
148 148 _, out, err = os.popen3(cmd)
149 149 return str(out), str(err)
150 150 else:
151 151 p = subprocess.Popen(cmd, stdout=subprocess.PIPE,
152 152 stderr=subprocess.PIPE, env=env)
153 153 out, err = p.communicate()
154 154 return out, err
155 155
156 156 def runhg(cmd, env):
157 157 out, err = runcmd(cmd, env)
158 158 # If root is executing setup.py, but the repository is owned by
159 159 # another user (as in "sudo python setup.py install") we will get
160 160 # trust warnings since the .hg/hgrc file is untrusted. That is
161 161 # fine, we don't want to load it anyway. Python may warn about
162 162 # a missing __init__.py in mercurial/locale, we also ignore that.
163 163 err = [e for e in err.splitlines()
164 164 if not e.startswith(b('not trusting file')) \
165 165 and not e.startswith(b('warning: Not importing')) \
166 166 and not e.startswith(b('obsolete feature not enabled'))]
167 167 if err:
168 168 printf("stderr from '%s':" % (' '.join(cmd)), file=sys.stderr)
169 169 printf(b('\n').join([b(' ') + e for e in err]), file=sys.stderr)
170 170 return ''
171 171 return out
172 172
173 173 version = ''
174 174
175 175 # Execute hg out of this directory with a custom environment which
176 176 # includes the pure Python modules in mercurial/pure. We also take
177 177 # care to not use any hgrc files and do no localization.
178 178 pypath = ['mercurial', os.path.join('mercurial', 'pure')]
179 179 env = {'PYTHONPATH': os.pathsep.join(pypath),
180 180 'HGRCPATH': '',
181 181 'LANGUAGE': 'C'}
182 182 if 'LD_LIBRARY_PATH' in os.environ:
183 183 env['LD_LIBRARY_PATH'] = os.environ['LD_LIBRARY_PATH']
184 184 if 'SystemRoot' in os.environ:
185 185 # Copy SystemRoot into the custom environment for Python 2.6
186 186 # under Windows. Otherwise, the subprocess will fail with
187 187 # error 0xc0150004. See: http://bugs.python.org/issue3440
188 188 env['SystemRoot'] = os.environ['SystemRoot']
189 189
190 190 if os.path.isdir('.hg'):
191 191 cmd = [sys.executable, 'hg', 'log', '-r', '.', '--template', '{tags}\n']
192 192 numerictags = [t for t in runhg(cmd, env).split() if t[0].isdigit()]
193 193 hgid = runhg([sys.executable, 'hg', 'id', '-i'], env).strip()
194 194 if numerictags: # tag(s) found
195 195 version = numerictags[-1]
196 196 if hgid.endswith('+'): # propagate the dirty status to the tag
197 197 version += '+'
198 198 else: # no tag found
199 199 ltagcmd = [sys.executable, 'hg', 'parents', '--template',
200 200 '{latesttag}']
201 201 ltag = runhg(ltagcmd, env)
202 202 changessincecmd = [sys.executable, 'hg', 'log', '-T', 'x\n', '-r',
203 203 "only(.,'%s')" % ltag]
204 204 changessince = len(runhg(changessincecmd, env).splitlines())
205 205 version = '%s+%s-%s' % (ltag, changessince, hgid)
206 206 if version.endswith('+'):
207 207 version += time.strftime('%Y%m%d')
208 208 elif os.path.exists('.hg_archival.txt'):
209 209 kw = dict([[t.strip() for t in l.split(':', 1)]
210 210 for l in open('.hg_archival.txt')])
211 211 if 'tag' in kw:
212 212 version = kw['tag']
213 213 elif 'latesttag' in kw:
214 214 if 'changessincelatesttag' in kw:
215 215 version = '%(latesttag)s+%(changessincelatesttag)s-%(node).12s' % kw
216 216 else:
217 217 version = '%(latesttag)s+%(latesttagdistance)s-%(node).12s' % kw
218 218 else:
219 219 version = kw.get('node', '')[:12]
220 220
221 221 if version:
222 222 f = open("mercurial/__version__.py", "w")
223 223 f.write('# this file is autogenerated by setup.py\n')
224 224 f.write('version = "%s"\n' % version)
225 225 f.close()
226 226
227 227
228 228 try:
229 229 from mercurial import __version__
230 230 version = __version__.version
231 231 except ImportError:
232 232 version = 'unknown'
233 233
234 234 class hgbuild(build):
235 235 # Insert hgbuildmo first so that files in mercurial/locale/ are found
236 236 # when build_py is run next.
237 237 sub_commands = [('build_mo', None),
238 238
239 239 # We also need build_ext before build_py. Otherwise, when 2to3 is
240 240 # called (in build_py), it will not find osutil & friends,
241 241 # thinking that those modules are global and, consequently, making
242 242 # a mess, now that all module imports are global.
243 243
244 244 ('build_ext', build.has_ext_modules),
245 245 ] + build.sub_commands
246 246
247 247 class hgbuildmo(build):
248 248
249 249 description = "build translations (.mo files)"
250 250
251 251 def run(self):
252 252 if not find_executable('msgfmt'):
253 253 self.warn("could not find msgfmt executable, no translations "
254 254 "will be built")
255 255 return
256 256
257 257 podir = 'i18n'
258 258 if not os.path.isdir(podir):
259 259 self.warn("could not find %s/ directory" % podir)
260 260 return
261 261
262 262 join = os.path.join
263 263 for po in os.listdir(podir):
264 264 if not po.endswith('.po'):
265 265 continue
266 266 pofile = join(podir, po)
267 267 modir = join('locale', po[:-3], 'LC_MESSAGES')
268 268 mofile = join(modir, 'hg.mo')
269 269 mobuildfile = join('mercurial', mofile)
270 270 cmd = ['msgfmt', '-v', '-o', mobuildfile, pofile]
271 271 if sys.platform != 'sunos5':
272 272 # msgfmt on Solaris does not know about -c
273 273 cmd.append('-c')
274 274 self.mkpath(join('mercurial', modir))
275 275 self.make_file([pofile], mobuildfile, spawn, (cmd,))
276 276
277 277
278 278 class hgdist(Distribution):
279 279 pure = 0
280 280
281 281 global_options = Distribution.global_options + \
282 282 [('pure', None, "use pure (slow) Python "
283 283 "code instead of C extensions"),
284 284 ('c2to3', None, "(experimental!) convert "
285 285 "code with 2to3"),
286 286 ]
287 287
288 288 def has_ext_modules(self):
289 289 # self.ext_modules is emptied in hgbuildpy.finalize_options which is
290 290 # too late for some cases
291 291 return not self.pure and Distribution.has_ext_modules(self)
292 292
293 293 class hgbuildext(build_ext):
294 294
295 295 def build_extension(self, ext):
296 296 try:
297 297 build_ext.build_extension(self, ext)
298 298 except CCompilerError:
299 299 if not getattr(ext, 'optional', False):
300 300 raise
301 301 log.warn("Failed to build optional extension '%s' (skipping)",
302 302 ext.name)
303 303
304 304 class hgbuildpy(build_py):
305 305 if convert2to3:
306 306 fixer_names = sorted(set(getfixers("lib2to3.fixes") +
307 307 getfixers("hgfixes")))
308 308
309 309 def finalize_options(self):
310 310 build_py.finalize_options(self)
311 311
312 312 if self.distribution.pure:
313 313 if self.py_modules is None:
314 314 self.py_modules = []
315 315 for ext in self.distribution.ext_modules:
316 316 if ext.name.startswith("mercurial."):
317 317 self.py_modules.append("mercurial.pure.%s" % ext.name[10:])
318 318 self.distribution.ext_modules = []
319 319 else:
320 320 h = os.path.join(get_python_inc(), 'Python.h')
321 321 if not os.path.exists(h):
322 322 raise SystemExit('Python headers are required to build '
323 323 'Mercurial but weren\'t found in %s' % h)
324 324
325 325 def find_modules(self):
326 326 modules = build_py.find_modules(self)
327 327 for module in modules:
328 328 if module[0] == "mercurial.pure":
329 329 if module[1] != "__init__":
330 330 yield ("mercurial", module[1], module[2])
331 331 else:
332 332 yield module
333 333
334 334 class buildhgextindex(Command):
335 335 description = 'generate prebuilt index of hgext (for frozen package)'
336 336 user_options = []
337 337 _indexfilename = 'hgext/__index__.py'
338 338
339 339 def initialize_options(self):
340 340 pass
341 341
342 342 def finalize_options(self):
343 343 pass
344 344
345 345 def run(self):
346 346 if os.path.exists(self._indexfilename):
347 347 f = open(self._indexfilename, 'w')
348 348 f.write('# empty\n')
349 349 f.close()
350 350
351 351 # here no extension enabled, disabled() lists up everything
352 352 code = ('import pprint; from mercurial import extensions; '
353 353 'pprint.pprint(extensions.disabled())')
354 354 out, err = runcmd([sys.executable, '-c', code], env)
355 355 if err:
356 356 raise DistutilsExecError(err)
357 357
358 358 f = open(self._indexfilename, 'w')
359 359 f.write('# this file is autogenerated by setup.py\n')
360 360 f.write('docs = ')
361 361 f.write(out)
362 362 f.close()
363 363
364 364 class buildhgexe(build_ext):
365 365 description = 'compile hg.exe from mercurial/exewrapper.c'
366 366
367 367 def build_extensions(self):
368 368 if os.name != 'nt':
369 369 return
370 370 if isinstance(self.compiler, HackedMingw32CCompiler):
371 371 self.compiler.compiler_so = self.compiler.compiler # no -mdll
372 372 self.compiler.dll_libraries = [] # no -lmsrvc90
373 373 hv = sys.hexversion
374 374 pythonlib = 'python%d%d' % (hv >> 24, (hv >> 16) & 0xff)
375 375 f = open('mercurial/hgpythonlib.h', 'wb')
376 376 f.write('/* this file is autogenerated by setup.py */\n')
377 377 f.write('#define HGPYTHONLIB "%s"\n' % pythonlib)
378 378 f.close()
379 379 objects = self.compiler.compile(['mercurial/exewrapper.c'],
380 380 output_dir=self.build_temp)
381 381 dir = os.path.dirname(self.get_ext_fullpath('dummy'))
382 382 target = os.path.join(dir, 'hg')
383 383 self.compiler.link_executable(objects, target,
384 384 libraries=[],
385 385 output_dir=self.build_temp)
386 386
387 387 class hginstalllib(install_lib):
388 388 '''
389 389 This is a specialization of install_lib that replaces the copy_file used
390 390 there so that it supports setting the mode of files after copying them,
391 391 instead of just preserving the mode that the files originally had. If your
392 392 system has a umask of something like 027, preserving the permissions when
393 393 copying will lead to a broken install.
394 394
395 395 Note that just passing keep_permissions=False to copy_file would be
396 396 insufficient, as it might still be applying a umask.
397 397 '''
398 398
399 399 def run(self):
400 400 realcopyfile = file_util.copy_file
401 401 def copyfileandsetmode(*args, **kwargs):
402 402 src, dst = args[0], args[1]
403 403 dst, copied = realcopyfile(*args, **kwargs)
404 404 if copied:
405 405 st = os.stat(src)
406 406 # Persist executable bit (apply it to group and other if user
407 407 # has it)
408 408 if st[stat.ST_MODE] & stat.S_IXUSR:
409 409 setmode = 0755
410 410 else:
411 411 setmode = 0644
412 412 os.chmod(dst, (stat.S_IMODE(st[stat.ST_MODE]) & ~0777) |
413 413 setmode)
414 414 file_util.copy_file = copyfileandsetmode
415 415 try:
416 416 install_lib.run(self)
417 417 finally:
418 418 file_util.copy_file = realcopyfile
419 419
420 420 class hginstallscripts(install_scripts):
421 421 '''
422 422 This is a specialization of install_scripts that replaces the @LIBDIR@ with
423 423 the configured directory for modules. If possible, the path is made relative
424 424 to the directory for scripts.
425 425 '''
426 426
427 427 def initialize_options(self):
428 428 install_scripts.initialize_options(self)
429 429
430 430 self.install_lib = None
431 431
432 432 def finalize_options(self):
433 433 install_scripts.finalize_options(self)
434 434 self.set_undefined_options('install',
435 435 ('install_lib', 'install_lib'))
436 436
437 437 def run(self):
438 438 install_scripts.run(self)
439 439
440 440 if (os.path.splitdrive(self.install_dir)[0] !=
441 441 os.path.splitdrive(self.install_lib)[0]):
442 442 # can't make relative paths from one drive to another, so use an
443 443 # absolute path instead
444 444 libdir = self.install_lib
445 445 else:
446 446 common = os.path.commonprefix((self.install_dir, self.install_lib))
447 447 rest = self.install_dir[len(common):]
448 448 uplevel = len([n for n in os.path.split(rest) if n])
449 449
450 450 libdir = uplevel * ('..' + os.sep) + self.install_lib[len(common):]
451 451
452 452 for outfile in self.outfiles:
453 453 fp = open(outfile, 'rb')
454 454 data = fp.read()
455 455 fp.close()
456 456
457 457 # skip binary files
458 458 if b('\0') in data:
459 459 continue
460 460
461 461 data = data.replace(b('@LIBDIR@'), libdir.encode(libdir_escape))
462 462 fp = open(outfile, 'wb')
463 463 fp.write(data)
464 464 fp.close()
465 465
466 466 cmdclass = {'build': hgbuild,
467 467 'build_mo': hgbuildmo,
468 468 'build_ext': hgbuildext,
469 469 'build_py': hgbuildpy,
470 470 'build_hgextindex': buildhgextindex,
471 471 'install_lib': hginstalllib,
472 472 'install_scripts': hginstallscripts,
473 473 'build_hgexe': buildhgexe,
474 474 }
475 475
476 476 packages = ['mercurial', 'mercurial.hgweb', 'mercurial.httpclient',
477 477 'hgext', 'hgext.convert', 'hgext.highlight', 'hgext.zeroconf',
478 478 'hgext.largefiles']
479 479
480 480 pymodules = []
481 481
482 482 common_depends = ['mercurial/util.h']
483 483
484 484 extmodules = [
485 485 Extension('mercurial.base85', ['mercurial/base85.c'],
486 486 depends=common_depends),
487 487 Extension('mercurial.bdiff', ['mercurial/bdiff.c'],
488 488 depends=common_depends),
489 489 Extension('mercurial.diffhelpers', ['mercurial/diffhelpers.c'],
490 490 depends=common_depends),
491 491 Extension('mercurial.mpatch', ['mercurial/mpatch.c'],
492 492 depends=common_depends),
493 493 Extension('mercurial.parsers', ['mercurial/dirs.c',
494 494 'mercurial/parsers.c',
495 495 'mercurial/pathencode.c'],
496 496 depends=common_depends),
497 497 ]
498 498
499 499 osutil_ldflags = []
500 500
501 501 if sys.platform == 'darwin':
502 502 osutil_ldflags += ['-framework', 'ApplicationServices']
503 503
504 504 # disable osutil.c under windows + python 2.4 (issue1364)
505 505 if sys.platform == 'win32' and sys.version_info < (2, 5, 0, 'final'):
506 506 pymodules.append('mercurial.pure.osutil')
507 507 else:
508 508 extmodules.append(Extension('mercurial.osutil', ['mercurial/osutil.c'],
509 509 extra_link_args=osutil_ldflags,
510 510 depends=common_depends))
511 511
512 512 try:
513 513 from distutils import cygwinccompiler
514 514
515 515 # the -mno-cygwin option has been deprecated for years
516 516 compiler = cygwinccompiler.Mingw32CCompiler
517 517
518 518 class HackedMingw32CCompiler(cygwinccompiler.Mingw32CCompiler):
519 519 def __init__(self, *args, **kwargs):
520 520 compiler.__init__(self, *args, **kwargs)
521 521 for i in 'compiler compiler_so linker_exe linker_so'.split():
522 522 try:
523 523 getattr(self, i).remove('-mno-cygwin')
524 524 except ValueError:
525 525 pass
526 526
527 527 cygwinccompiler.Mingw32CCompiler = HackedMingw32CCompiler
528 528 except ImportError:
529 529 # the cygwinccompiler package is not available on some Python
530 530 # distributions like the ones from the optware project for Synology
531 531 # DiskStation boxes
532 532 class HackedMingw32CCompiler(object):
533 533 pass
534 534
535 535 packagedata = {'mercurial': ['locale/*/LC_MESSAGES/hg.mo',
536 536 'help/*.txt',
537 537 'default.d/*.rc',
538 538 'dummycert.pem']}
539 539
540 540 def ordinarypath(p):
541 541 return p and p[0] != '.' and p[-1] != '~'
542 542
543 543 for root in ('templates',):
544 544 for curdir, dirs, files in os.walk(os.path.join('mercurial', root)):
545 545 curdir = curdir.split(os.sep, 1)[1]
546 546 dirs[:] = filter(ordinarypath, dirs)
547 547 for f in filter(ordinarypath, files):
548 548 f = os.path.join(curdir, f)
549 549 packagedata['mercurial'].append(f)
550 550
551 551 datafiles = []
552 552 setupversion = version
553 553 extra = {}
554 554
555 555 if py2exeloaded:
556 556 extra['console'] = [
557 557 {'script':'hg',
558 'copyright':'Copyright (C) 2005-2010 Matt Mackall and others',
558 'copyright':'Copyright (C) 2005-2015 Matt Mackall and others',
559 559 'product_version':version}]
560 560 # sub command of 'build' because 'py2exe' does not handle sub_commands
561 561 build.sub_commands.insert(0, ('build_hgextindex', None))
562 562
563 563 if os.name == 'nt':
564 564 # Windows binary file versions for exe/dll files must have the
565 565 # form W.X.Y.Z, where W,X,Y,Z are numbers in the range 0..65535
566 566 setupversion = version.split('+', 1)[0]
567 567
568 568 if sys.platform == 'darwin' and os.path.exists('/usr/bin/xcodebuild'):
569 569 version = runcmd(['/usr/bin/xcodebuild', '-version'], {})[0].splitlines()
570 570 if version:
571 571 version = version[0]
572 572 xcode4 = (version.startswith('Xcode') and
573 573 StrictVersion(version.split()[1]) >= StrictVersion('4.0'))
574 574 xcode51 = re.match(r'^Xcode\s+5\.1', version) is not None
575 575 else:
576 576 # xcodebuild returns empty on OS X Lion with XCode 4.3 not
577 577 # installed, but instead with only command-line tools. Assume
578 578 # that only happens on >= Lion, thus no PPC support.
579 579 xcode4 = True
580 580 xcode51 = False
581 581
582 582 # XCode 4.0 dropped support for ppc architecture, which is hardcoded in
583 583 # distutils.sysconfig
584 584 if xcode4:
585 585 os.environ['ARCHFLAGS'] = ''
586 586
587 587 # XCode 5.1 changes clang such that it now fails to compile if the
588 588 # -mno-fused-madd flag is passed, but the version of Python shipped with
589 589 # OS X 10.9 Mavericks includes this flag. This causes problems in all
590 590 # C extension modules, and a bug has been filed upstream at
591 591 # http://bugs.python.org/issue21244. We also need to patch this here
592 592 # so Mercurial can continue to compile in the meantime.
593 593 if xcode51:
594 594 cflags = get_config_var('CFLAGS')
595 595 if cflags and re.search(r'-mno-fused-madd\b', cflags) is not None:
596 596 os.environ['CFLAGS'] = (
597 597 os.environ.get('CFLAGS', '') + ' -Qunused-arguments')
598 598
599 599 setup(name='mercurial',
600 600 version=setupversion,
601 601 author='Matt Mackall and many others',
602 602 author_email='mercurial@selenic.com',
603 603 url='http://mercurial.selenic.com/',
604 604 download_url='http://mercurial.selenic.com/release/',
605 605 description=('Fast scalable distributed SCM (revision control, version '
606 606 'control) system'),
607 607 long_description=('Mercurial is a distributed SCM tool written in Python.'
608 608 ' It is used by a number of large projects that require'
609 609 ' fast, reliable distributed revision control, such as '
610 610 'Mozilla.'),
611 611 license='GNU GPLv2 or any later version',
612 612 classifiers=[
613 613 'Development Status :: 6 - Mature',
614 614 'Environment :: Console',
615 615 'Intended Audience :: Developers',
616 616 'Intended Audience :: System Administrators',
617 617 'License :: OSI Approved :: GNU General Public License (GPL)',
618 618 'Natural Language :: Danish',
619 619 'Natural Language :: English',
620 620 'Natural Language :: German',
621 621 'Natural Language :: Italian',
622 622 'Natural Language :: Japanese',
623 623 'Natural Language :: Portuguese (Brazilian)',
624 624 'Operating System :: Microsoft :: Windows',
625 625 'Operating System :: OS Independent',
626 626 'Operating System :: POSIX',
627 627 'Programming Language :: C',
628 628 'Programming Language :: Python',
629 629 'Topic :: Software Development :: Version Control',
630 630 ],
631 631 scripts=scripts,
632 632 packages=packages,
633 633 py_modules=pymodules,
634 634 ext_modules=extmodules,
635 635 data_files=datafiles,
636 636 package_data=packagedata,
637 637 cmdclass=cmdclass,
638 638 distclass=hgdist,
639 639 options={'py2exe': {'packages': ['hgext', 'email']},
640 640 'bdist_mpkg': {'zipdist': False,
641 641 'license': 'COPYING',
642 642 'readme': 'contrib/macosx/Readme.html',
643 643 'welcome': 'contrib/macosx/Welcome.html',
644 644 },
645 645 },
646 646 **extra)
Show file before | Show file after | Hide comments
@@ -1,2240 +1,2240 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 copy 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 merge-tools Merge Tools
115 115 multirevs Specifying Multiple Revisions
116 116 patterns File Name Patterns
117 117 phases Working with Phases
118 118 revisions Specifying Single Revisions
119 119 revsets Specifying Revision Sets
120 120 subrepos Subrepositories
121 121 templating Template Usage
122 122 urls URL Paths
123 123
124 124 (use "hg help -v" to show built-in aliases and global options)
125 125
126 126 $ hg -q help
127 127 add add the specified files on the next commit
128 128 addremove add all new files, delete all missing files
129 129 annotate show changeset information by line for each file
130 130 archive create an unversioned archive of a repository revision
131 131 backout reverse effect of earlier changeset
132 132 bisect subdivision search of changesets
133 133 bookmarks create a new bookmark or list existing bookmarks
134 134 branch set or show the current branch name
135 135 branches list repository named branches
136 136 bundle create a changegroup file
137 137 cat output the current or given revision of files
138 138 clone make a copy of an existing repository
139 139 commit commit the specified files or all outstanding changes
140 140 config show combined config settings from all hgrc files
141 141 copy mark files as copied for the next commit
142 142 diff diff repository (or selected files)
143 143 export dump the header and diffs for one or more changesets
144 144 files list tracked files
145 145 forget forget the specified files on the next commit
146 146 graft copy changes from other branches onto the current branch
147 147 grep search for a pattern in specified files and revisions
148 148 heads show branch heads
149 149 help show help for a given topic or a help overview
150 150 identify identify the working copy or specified revision
151 151 import import an ordered set of patches
152 152 incoming show new changesets found in source
153 153 init create a new repository in the given directory
154 154 log show revision history of entire repository or files
155 155 manifest output the current or given revision of the project manifest
156 156 merge merge another revision into working directory
157 157 outgoing show changesets not found in the destination
158 158 paths show aliases for remote repositories
159 159 phase set or show the current phase name
160 160 pull pull changes from the specified source
161 161 push push changes to the specified destination
162 162 recover roll back an interrupted transaction
163 163 remove remove the specified files on the next commit
164 164 rename rename files; equivalent of copy + remove
165 165 resolve redo merges or set/view the merge status of files
166 166 revert restore files to their checkout state
167 167 root print the root (top) of the current working directory
168 168 serve start stand-alone webserver
169 169 status show changed files in the working directory
170 170 summary summarize working directory state
171 171 tag add one or more tags for the current or given revision
172 172 tags list repository tags
173 173 unbundle apply one or more changegroup files
174 174 update update working directory (or switch revisions)
175 175 verify verify the integrity of the repository
176 176 version output version and copyright information
177 177
178 178 additional help topics:
179 179
180 180 config Configuration Files
181 181 dates Date Formats
182 182 diffs Diff Formats
183 183 environment Environment Variables
184 184 extensions Using Additional Features
185 185 filesets Specifying File Sets
186 186 glossary Glossary
187 187 hgignore Syntax for Mercurial Ignore Files
188 188 hgweb Configuring hgweb
189 189 merge-tools Merge Tools
190 190 multirevs Specifying Multiple Revisions
191 191 patterns File Name Patterns
192 192 phases Working with Phases
193 193 revisions Specifying Single Revisions
194 194 revsets Specifying Revision Sets
195 195 subrepos Subrepositories
196 196 templating Template Usage
197 197 urls URL Paths
198 198
199 199 Test extension help:
200 200 $ hg help extensions --config extensions.rebase= --config extensions.children=
201 201 Using Additional Features
202 202 """""""""""""""""""""""""
203 203
204 204 Mercurial has the ability to add new features through the use of
205 205 extensions. Extensions may add new commands, add options to existing
206 206 commands, change the default behavior of commands, or implement hooks.
207 207
208 208 To enable the "foo" extension, either shipped with Mercurial or in the
209 209 Python search path, create an entry for it in your configuration file,
210 210 like this:
211 211
212 212 [extensions]
213 213 foo =
214 214
215 215 You may also specify the full path to an extension:
216 216
217 217 [extensions]
218 218 myfeature = ~/.hgext/myfeature.py
219 219
220 220 See "hg help config" for more information on configuration files.
221 221
222 222 Extensions are not loaded by default for a variety of reasons: they can
223 223 increase startup overhead; they may be meant for advanced usage only; they
224 224 may provide potentially dangerous abilities (such as letting you destroy
225 225 or modify history); they might not be ready for prime time; or they may
226 226 alter some usual behaviors of stock Mercurial. It is thus up to the user
227 227 to activate extensions as needed.
228 228
229 229 To explicitly disable an extension enabled in a configuration file of
230 230 broader scope, prepend its path with !:
231 231
232 232 [extensions]
233 233 # disabling extension bar residing in /path/to/extension/bar.py
234 234 bar = !/path/to/extension/bar.py
235 235 # ditto, but no path was supplied for extension baz
236 236 baz = !
237 237
238 238 enabled extensions:
239 239
240 240 children command to display child changesets (DEPRECATED)
241 241 rebase command to move sets of revisions to a different ancestor
242 242
243 243 disabled extensions:
244 244
245 245 acl hooks for controlling repository access
246 246 blackbox log repository events to a blackbox for debugging
247 247 bugzilla hooks for integrating with the Bugzilla bug tracker
248 248 churn command to display statistics about repository history
249 249 color colorize output from some commands
250 250 convert import revisions from foreign VCS repositories into
251 251 Mercurial
252 252 eol automatically manage newlines in repository files
253 253 extdiff command to allow external programs to compare revisions
254 254 factotum http authentication with factotum
255 255 gpg commands to sign and verify changesets
256 256 hgcia hooks for integrating with the CIA.vc notification service
257 257 hgk browse the repository in a graphical way
258 258 highlight syntax highlighting for hgweb (requires Pygments)
259 259 histedit interactive history editing
260 260 keyword expand keywords in tracked files
261 261 largefiles track large binary files
262 262 mq manage a stack of patches
263 263 notify hooks for sending email push notifications
264 264 pager browse command output with an external pager
265 265 patchbomb command to send changesets as (a series of) patch emails
266 266 progress show progress bars for some actions
267 267 purge command to delete untracked files from the working
268 268 directory
269 269 record commands to interactively select changes for
270 270 commit/qrefresh
271 271 relink recreates hardlinks between repository clones
272 272 schemes extend schemes with shortcuts to repository swarms
273 273 share share a common history between several working directories
274 274 shelve save and restore changes to the working directory
275 275 strip strip changesets and their descendants from history
276 276 transplant command to transplant changesets from another branch
277 277 win32mbcs allow the use of MBCS paths with problematic encodings
278 278 zeroconf discover and advertise repositories on the local network
279 279 Test short command list with verbose option
280 280
281 281 $ hg -v help shortlist
282 282 Mercurial Distributed SCM
283 283
284 284 basic commands:
285 285
286 286 add add the specified files on the next commit
287 287 annotate, blame
288 288 show changeset information by line for each file
289 289 clone make a copy of an existing repository
290 290 commit, ci commit the specified files or all outstanding changes
291 291 diff diff repository (or selected files)
292 292 export dump the header and diffs for one or more changesets
293 293 forget forget the specified files on the next commit
294 294 init create a new repository in the given directory
295 295 log, history show revision history of entire repository or files
296 296 merge merge another revision into working directory
297 297 pull pull changes from the specified source
298 298 push push changes to the specified destination
299 299 remove, rm remove the specified files on the next commit
300 300 serve start stand-alone webserver
301 301 status, st show changed files in the working directory
302 302 summary, sum summarize working directory state
303 303 update, up, checkout, co
304 304 update working directory (or switch revisions)
305 305
306 306 global options ([+] can be repeated):
307 307
308 308 -R --repository REPO repository root directory or name of overlay bundle
309 309 file
310 310 --cwd DIR change working directory
311 311 -y --noninteractive do not prompt, automatically pick the first choice for
312 312 all prompts
313 313 -q --quiet suppress output
314 314 -v --verbose enable additional output
315 315 --config CONFIG [+] set/override config option (use 'section.name=value')
316 316 --debug enable debugging output
317 317 --debugger start debugger
318 318 --encoding ENCODE set the charset encoding (default: ascii)
319 319 --encodingmode MODE set the charset encoding mode (default: strict)
320 320 --traceback always print a traceback on exception
321 321 --time time how long the command takes
322 322 --profile print command execution profile
323 323 --version output version information and exit
324 324 -h --help display help and exit
325 325 --hidden consider hidden changesets
326 326
327 327 (use "hg help" for the full list of commands)
328 328
329 329 $ hg add -h
330 330 hg add [OPTION]... [FILE]...
331 331
332 332 add the specified files on the next commit
333 333
334 334 Schedule files to be version controlled and added to the repository.
335 335
336 336 The files will be added to the repository at the next commit. To undo an
337 337 add before that, see "hg forget".
338 338
339 339 If no names are given, add all files to the repository.
340 340
341 341 Returns 0 if all files are successfully added.
342 342
343 343 options ([+] can be repeated):
344 344
345 345 -I --include PATTERN [+] include names matching the given patterns
346 346 -X --exclude PATTERN [+] exclude names matching the given patterns
347 347 -S --subrepos recurse into subrepositories
348 348 -n --dry-run do not perform actions, just print output
349 349
350 350 (some details hidden, use --verbose to show complete help)
351 351
352 352 Verbose help for add
353 353
354 354 $ hg add -hv
355 355 hg add [OPTION]... [FILE]...
356 356
357 357 add the specified files on the next commit
358 358
359 359 Schedule files to be version controlled and added to the repository.
360 360
361 361 The files will be added to the repository at the next commit. To undo an
362 362 add before that, see "hg forget".
363 363
364 364 If no names are given, add all files to the repository.
365 365
366 366 An example showing how new (unknown) files are added automatically by "hg
367 367 add":
368 368
369 369 $ ls
370 370 foo.c
371 371 $ hg status
372 372 ? foo.c
373 373 $ hg add
374 374 adding foo.c
375 375 $ hg status
376 376 A foo.c
377 377
378 378 Returns 0 if all files are successfully added.
379 379
380 380 options ([+] can be repeated):
381 381
382 382 -I --include PATTERN [+] include names matching the given patterns
383 383 -X --exclude PATTERN [+] exclude names matching the given patterns
384 384 -S --subrepos recurse into subrepositories
385 385 -n --dry-run do not perform actions, just print output
386 386
387 387 global options ([+] can be repeated):
388 388
389 389 -R --repository REPO repository root directory or name of overlay bundle
390 390 file
391 391 --cwd DIR change working directory
392 392 -y --noninteractive do not prompt, automatically pick the first choice for
393 393 all prompts
394 394 -q --quiet suppress output
395 395 -v --verbose enable additional output
396 396 --config CONFIG [+] set/override config option (use 'section.name=value')
397 397 --debug enable debugging output
398 398 --debugger start debugger
399 399 --encoding ENCODE set the charset encoding (default: ascii)
400 400 --encodingmode MODE set the charset encoding mode (default: strict)
401 401 --traceback always print a traceback on exception
402 402 --time time how long the command takes
403 403 --profile print command execution profile
404 404 --version output version information and exit
405 405 -h --help display help and exit
406 406 --hidden consider hidden changesets
407 407
408 408 Test help option with version option
409 409
410 410 $ hg add -h --version
411 411 Mercurial Distributed SCM (version *) (glob)
412 412 (see http://mercurial.selenic.com for more information)
413 413
414 Copyright (C) 2005-2014 Matt Mackall and others
414 Copyright (C) 2005-2015 Matt Mackall and others
415 415 This is free software; see the source for copying conditions. There is NO
416 416 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
417 417
418 418 $ hg add --skjdfks
419 419 hg add: option --skjdfks not recognized
420 420 hg add [OPTION]... [FILE]...
421 421
422 422 add the specified files on the next commit
423 423
424 424 options ([+] can be repeated):
425 425
426 426 -I --include PATTERN [+] include names matching the given patterns
427 427 -X --exclude PATTERN [+] exclude names matching the given patterns
428 428 -S --subrepos recurse into subrepositories
429 429 -n --dry-run do not perform actions, just print output
430 430
431 431 (use "hg add -h" to show more help)
432 432 [255]
433 433
434 434 Test ambiguous command help
435 435
436 436 $ hg help ad
437 437 list of commands:
438 438
439 439 add add the specified files on the next commit
440 440 addremove add all new files, delete all missing files
441 441
442 442 (use "hg help -v ad" to show built-in aliases and global options)
443 443
444 444 Test command without options
445 445
446 446 $ hg help verify
447 447 hg verify
448 448
449 449 verify the integrity of the repository
450 450
451 451 Verify the integrity of the current repository.
452 452
453 453 This will perform an extensive check of the repository's integrity,
454 454 validating the hashes and checksums of each entry in the changelog,
455 455 manifest, and tracked files, as well as the integrity of their crosslinks
456 456 and indices.
457 457
458 458 Please see http://mercurial.selenic.com/wiki/RepositoryCorruption for more
459 459 information about recovery from corruption of the repository.
460 460
461 461 Returns 0 on success, 1 if errors are encountered.
462 462
463 463 (some details hidden, use --verbose to show complete help)
464 464
465 465 $ hg help diff
466 466 hg diff [OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...
467 467
468 468 diff repository (or selected files)
469 469
470 470 Show differences between revisions for the specified files.
471 471
472 472 Differences between files are shown using the unified diff format.
473 473
474 474 Note:
475 475 diff may generate unexpected results for merges, as it will default to
476 476 comparing against the working directory's first parent changeset if no
477 477 revisions are specified.
478 478
479 479 When two revision arguments are given, then changes are shown between
480 480 those revisions. If only one revision is specified then that revision is
481 481 compared to the working directory, and, when no revisions are specified,
482 482 the working directory files are compared to its parent.
483 483
484 484 Alternatively you can specify -c/--change with a revision to see the
485 485 changes in that changeset relative to its first parent.
486 486
487 487 Without the -a/--text option, diff will avoid generating diffs of files it
488 488 detects as binary. With -a, diff will generate a diff anyway, probably
489 489 with undesirable results.
490 490
491 491 Use the -g/--git option to generate diffs in the git extended diff format.
492 492 For more information, read "hg help diffs".
493 493
494 494 Returns 0 on success.
495 495
496 496 options ([+] can be repeated):
497 497
498 498 -r --rev REV [+] revision
499 499 -c --change REV change made by revision
500 500 -a --text treat all files as text
501 501 -g --git use git extended diff format
502 502 --nodates omit dates from diff headers
503 503 --noprefix omit a/ and b/ prefixes from filenames
504 504 -p --show-function show which function each change is in
505 505 --reverse produce a diff that undoes the changes
506 506 -w --ignore-all-space ignore white space when comparing lines
507 507 -b --ignore-space-change ignore changes in the amount of white space
508 508 -B --ignore-blank-lines ignore changes whose lines are all blank
509 509 -U --unified NUM number of lines of context to show
510 510 --stat output diffstat-style summary of changes
511 511 -I --include PATTERN [+] include names matching the given patterns
512 512 -X --exclude PATTERN [+] exclude names matching the given patterns
513 513 -S --subrepos recurse into subrepositories
514 514
515 515 (some details hidden, use --verbose to show complete help)
516 516
517 517 $ hg help status
518 518 hg status [OPTION]... [FILE]...
519 519
520 520 aliases: st
521 521
522 522 show changed files in the working directory
523 523
524 524 Show status of files in the repository. If names are given, only files
525 525 that match are shown. Files that are clean or ignored or the source of a
526 526 copy/move operation, are not listed unless -c/--clean, -i/--ignored,
527 527 -C/--copies or -A/--all are given. Unless options described with "show
528 528 only ..." are given, the options -mardu are used.
529 529
530 530 Option -q/--quiet hides untracked (unknown and ignored) files unless
531 531 explicitly requested with -u/--unknown or -i/--ignored.
532 532
533 533 Note:
534 534 status may appear to disagree with diff if permissions have changed or
535 535 a merge has occurred. The standard diff format does not report
536 536 permission changes and diff only reports changes relative to one merge
537 537 parent.
538 538
539 539 If one revision is given, it is used as the base revision. If two
540 540 revisions are given, the differences between them are shown. The --change
541 541 option can also be used as a shortcut to list the changed files of a
542 542 revision from its first parent.
543 543
544 544 The codes used to show the status of files are:
545 545
546 546 M = modified
547 547 A = added
548 548 R = removed
549 549 C = clean
550 550 ! = missing (deleted by non-hg command, but still tracked)
551 551 ? = not tracked
552 552 I = ignored
553 553 = origin of the previous file (with --copies)
554 554
555 555 Returns 0 on success.
556 556
557 557 options ([+] can be repeated):
558 558
559 559 -A --all show status of all files
560 560 -m --modified show only modified files
561 561 -a --added show only added files
562 562 -r --removed show only removed files
563 563 -d --deleted show only deleted (but tracked) files
564 564 -c --clean show only files without changes
565 565 -u --unknown show only unknown (not tracked) files
566 566 -i --ignored show only ignored files
567 567 -n --no-status hide status prefix
568 568 -C --copies show source of copied files
569 569 -0 --print0 end filenames with NUL, for use with xargs
570 570 --rev REV [+] show difference from revision
571 571 --change REV list the changed files of a revision
572 572 -I --include PATTERN [+] include names matching the given patterns
573 573 -X --exclude PATTERN [+] exclude names matching the given patterns
574 574 -S --subrepos recurse into subrepositories
575 575
576 576 (some details hidden, use --verbose to show complete help)
577 577
578 578 $ hg -q help status
579 579 hg status [OPTION]... [FILE]...
580 580
581 581 show changed files in the working directory
582 582
583 583 $ hg help foo
584 584 abort: no such help topic: foo
585 585 (try "hg help --keyword foo")
586 586 [255]
587 587
588 588 $ hg skjdfks
589 589 hg: unknown command 'skjdfks'
590 590 Mercurial Distributed SCM
591 591
592 592 basic commands:
593 593
594 594 add add the specified files on the next commit
595 595 annotate show changeset information by line for each file
596 596 clone make a copy of an existing repository
597 597 commit commit the specified files or all outstanding changes
598 598 diff diff repository (or selected files)
599 599 export dump the header and diffs for one or more changesets
600 600 forget forget the specified files on the next commit
601 601 init create a new repository in the given directory
602 602 log show revision history of entire repository or files
603 603 merge merge another revision into working directory
604 604 pull pull changes from the specified source
605 605 push push changes to the specified destination
606 606 remove remove the specified files on the next commit
607 607 serve start stand-alone webserver
608 608 status show changed files in the working directory
609 609 summary summarize working directory state
610 610 update update working directory (or switch revisions)
611 611
612 612 (use "hg help" for the full list of commands or "hg -v" for details)
613 613 [255]
614 614
615 615
616 616 $ cat > helpext.py <<EOF
617 617 > import os
618 618 > from mercurial import cmdutil, commands
619 619 >
620 620 > cmdtable = {}
621 621 > command = cmdutil.command(cmdtable)
622 622 >
623 623 > @command('nohelp',
624 624 > [('', 'longdesc', 3, 'x'*90),
625 625 > ('n', '', None, 'normal desc'),
626 626 > ('', 'newline', '', 'line1\nline2')],
627 627 > 'hg nohelp',
628 628 > norepo=True)
629 629 > @command('debugoptDEP', [('', 'dopt', None, 'option is DEPRECATED')])
630 630 > def nohelp(ui, *args, **kwargs):
631 631 > pass
632 632 >
633 633 > EOF
634 634 $ echo '[extensions]' >> $HGRCPATH
635 635 $ echo "helpext = `pwd`/helpext.py" >> $HGRCPATH
636 636
637 637 Test command with no help text
638 638
639 639 $ hg help nohelp
640 640 hg nohelp
641 641
642 642 (no help text available)
643 643
644 644 options:
645 645
646 646 --longdesc VALUE xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
647 647 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx (default: 3)
648 648 -n -- normal desc
649 649 --newline VALUE line1 line2
650 650
651 651 (some details hidden, use --verbose to show complete help)
652 652
653 653 $ hg help -k nohelp
654 654 Commands:
655 655
656 656 nohelp hg nohelp
657 657
658 658 Extension Commands:
659 659
660 660 nohelp (no help text available)
661 661
662 662 Test that default list of commands omits extension commands
663 663
664 664 $ hg help
665 665 Mercurial Distributed SCM
666 666
667 667 list of commands:
668 668
669 669 add add the specified files on the next commit
670 670 addremove add all new files, delete all missing files
671 671 annotate show changeset information by line for each file
672 672 archive create an unversioned archive of a repository revision
673 673 backout reverse effect of earlier changeset
674 674 bisect subdivision search of changesets
675 675 bookmarks create a new bookmark or list existing bookmarks
676 676 branch set or show the current branch name
677 677 branches list repository named branches
678 678 bundle create a changegroup file
679 679 cat output the current or given revision of files
680 680 clone make a copy of an existing repository
681 681 commit commit the specified files or all outstanding changes
682 682 config show combined config settings from all hgrc files
683 683 copy mark files as copied for the next commit
684 684 diff diff repository (or selected files)
685 685 export dump the header and diffs for one or more changesets
686 686 files list tracked files
687 687 forget forget the specified files on the next commit
688 688 graft copy changes from other branches onto the current branch
689 689 grep search for a pattern in specified files and revisions
690 690 heads show branch heads
691 691 help show help for a given topic or a help overview
692 692 identify identify the working copy or specified revision
693 693 import import an ordered set of patches
694 694 incoming show new changesets found in source
695 695 init create a new repository in the given directory
696 696 log show revision history of entire repository or files
697 697 manifest output the current or given revision of the project manifest
698 698 merge merge another revision into working directory
699 699 outgoing show changesets not found in the destination
700 700 paths show aliases for remote repositories
701 701 phase set or show the current phase name
702 702 pull pull changes from the specified source
703 703 push push changes to the specified destination
704 704 recover roll back an interrupted transaction
705 705 remove remove the specified files on the next commit
706 706 rename rename files; equivalent of copy + remove
707 707 resolve redo merges or set/view the merge status of files
708 708 revert restore files to their checkout state
709 709 root print the root (top) of the current working directory
710 710 serve start stand-alone webserver
711 711 status show changed files in the working directory
712 712 summary summarize working directory state
713 713 tag add one or more tags for the current or given revision
714 714 tags list repository tags
715 715 unbundle apply one or more changegroup files
716 716 update update working directory (or switch revisions)
717 717 verify verify the integrity of the repository
718 718 version output version and copyright information
719 719
720 720 enabled extensions:
721 721
722 722 helpext (no help text available)
723 723
724 724 additional help topics:
725 725
726 726 config Configuration Files
727 727 dates Date Formats
728 728 diffs Diff Formats
729 729 environment Environment Variables
730 730 extensions Using Additional Features
731 731 filesets Specifying File Sets
732 732 glossary Glossary
733 733 hgignore Syntax for Mercurial Ignore Files
734 734 hgweb Configuring hgweb
735 735 merge-tools Merge Tools
736 736 multirevs Specifying Multiple Revisions
737 737 patterns File Name Patterns
738 738 phases Working with Phases
739 739 revisions Specifying Single Revisions
740 740 revsets Specifying Revision Sets
741 741 subrepos Subrepositories
742 742 templating Template Usage
743 743 urls URL Paths
744 744
745 745 (use "hg help -v" to show built-in aliases and global options)
746 746
747 747
748 748 Test list of internal help commands
749 749
750 750 $ hg help debug
751 751 debug commands (internal and unsupported):
752 752
753 753 debugancestor
754 754 find the ancestor revision of two revisions in a given index
755 755 debugbuilddag
756 756 builds a repo with a given DAG from scratch in the current
757 757 empty repo
758 758 debugbundle lists the contents of a bundle
759 759 debugcheckstate
760 760 validate the correctness of the current dirstate
761 761 debugcommands
762 762 list all available commands and options
763 763 debugcomplete
764 764 returns the completion list associated with the given command
765 765 debugdag format the changelog or an index DAG as a concise textual
766 766 description
767 767 debugdata dump the contents of a data file revision
768 768 debugdate parse and display a date
769 769 debugdirstate
770 770 show the contents of the current dirstate
771 771 debugdiscovery
772 772 runs the changeset discovery protocol in isolation
773 773 debugfileset parse and apply a fileset specification
774 774 debugfsinfo show information detected about current filesystem
775 775 debuggetbundle
776 776 retrieves a bundle from a repo
777 777 debugignore display the combined ignore pattern
778 778 debugindex dump the contents of an index file
779 779 debugindexdot
780 780 dump an index DAG as a graphviz dot file
781 781 debuginstall test Mercurial installation
782 782 debugknown test whether node ids are known to a repo
783 783 debuglocks show or modify state of locks
784 784 debugnamecomplete
785 785 complete "names" - tags, open branch names, bookmark names
786 786 debugobsolete
787 787 create arbitrary obsolete marker
788 788 debugoptDEP (no help text available)
789 789 debugpathcomplete
790 790 complete part or all of a tracked path
791 791 debugpushkey access the pushkey key/value protocol
792 792 debugpvec (no help text available)
793 793 debugrebuilddirstate
794 794 rebuild the dirstate as it would look like for the given
795 795 revision
796 796 debugrename dump rename information
797 797 debugrevlog show data and statistics about a revlog
798 798 debugrevspec parse and apply a revision specification
799 799 debugsetparents
800 800 manually set the parents of the current working directory
801 801 debugsub (no help text available)
802 802 debugsuccessorssets
803 803 show set of successors for revision
804 804 debugwalk show how files match on given patterns
805 805 debugwireargs
806 806 (no help text available)
807 807
808 808 (use "hg help -v debug" to show built-in aliases and global options)
809 809
810 810
811 811 Test list of commands with command with no help text
812 812
813 813 $ hg help helpext
814 814 helpext extension - no help text available
815 815
816 816 list of commands:
817 817
818 818 nohelp (no help text available)
819 819
820 820 (use "hg help -v helpext" to show built-in aliases and global options)
821 821
822 822
823 823 test deprecated option is hidden in command help
824 824 $ hg help debugoptDEP
825 825 hg debugoptDEP
826 826
827 827 (no help text available)
828 828
829 829 options:
830 830
831 831 (some details hidden, use --verbose to show complete help)
832 832
833 833 test deprecated option is shown with -v
834 834 $ hg help -v debugoptDEP | grep dopt
835 835 --dopt option is DEPRECATED
836 836
837 837 #if gettext
838 838 test deprecated option is hidden with translation with untranslated description
839 839 (use many globy for not failing on changed transaction)
840 840 $ LANGUAGE=sv hg help debugoptDEP
841 841 hg debugoptDEP
842 842
843 843 (*) (glob)
844 844
845 845 options:
846 846
847 847 (some details hidden, use --verbose to show complete help)
848 848 #endif
849 849
850 850 Test commands that collide with topics (issue4240)
851 851
852 852 $ hg config -hq
853 853 hg config [-u] [NAME]...
854 854
855 855 show combined config settings from all hgrc files
856 856 $ hg showconfig -hq
857 857 hg config [-u] [NAME]...
858 858
859 859 show combined config settings from all hgrc files
860 860
861 861 Test a help topic
862 862
863 863 $ hg help revs
864 864 Specifying Single Revisions
865 865 """""""""""""""""""""""""""
866 866
867 867 Mercurial supports several ways to specify individual revisions.
868 868
869 869 A plain integer is treated as a revision number. Negative integers are
870 870 treated as sequential offsets from the tip, with -1 denoting the tip, -2
871 871 denoting the revision prior to the tip, and so forth.
872 872
873 873 A 40-digit hexadecimal string is treated as a unique revision identifier.
874 874
875 875 A hexadecimal string less than 40 characters long is treated as a unique
876 876 revision identifier and is referred to as a short-form identifier. A
877 877 short-form identifier is only valid if it is the prefix of exactly one
878 878 full-length identifier.
879 879
880 880 Any other string is treated as a bookmark, tag, or branch name. A bookmark
881 881 is a movable pointer to a revision. A tag is a permanent name associated
882 882 with a revision. A branch name denotes the tipmost open branch head of
883 883 that branch - or if they are all closed, the tipmost closed head of the
884 884 branch. Bookmark, tag, and branch names must not contain the ":"
885 885 character.
886 886
887 887 The reserved name "tip" always identifies the most recent revision.
888 888
889 889 The reserved name "null" indicates the null revision. This is the revision
890 890 of an empty repository, and the parent of revision 0.
891 891
892 892 The reserved name "." indicates the working directory parent. If no
893 893 working directory is checked out, it is equivalent to null. If an
894 894 uncommitted merge is in progress, "." is the revision of the first parent.
895 895
896 896 Test templating help
897 897
898 898 $ hg help templating | egrep '(desc|diffstat|firstline|nonempty) '
899 899 desc String. The text of the changeset description.
900 900 diffstat String. Statistics of changes with the following format:
901 901 firstline Any text. Returns the first line of text.
902 902 nonempty Any text. Returns '(none)' if the string is empty.
903 903
904 904 Test help hooks
905 905
906 906 $ cat > helphook1.py <<EOF
907 907 > from mercurial import help
908 908 >
909 909 > def rewrite(topic, doc):
910 910 > return doc + '\nhelphook1\n'
911 911 >
912 912 > def extsetup(ui):
913 913 > help.addtopichook('revsets', rewrite)
914 914 > EOF
915 915 $ cat > helphook2.py <<EOF
916 916 > from mercurial import help
917 917 >
918 918 > def rewrite(topic, doc):
919 919 > return doc + '\nhelphook2\n'
920 920 >
921 921 > def extsetup(ui):
922 922 > help.addtopichook('revsets', rewrite)
923 923 > EOF
924 924 $ echo '[extensions]' >> $HGRCPATH
925 925 $ echo "helphook1 = `pwd`/helphook1.py" >> $HGRCPATH
926 926 $ echo "helphook2 = `pwd`/helphook2.py" >> $HGRCPATH
927 927 $ hg help revsets | grep helphook
928 928 helphook1
929 929 helphook2
930 930
931 931 Test keyword search help
932 932
933 933 $ cat > prefixedname.py <<EOF
934 934 > '''matched against word "clone"
935 935 > '''
936 936 > EOF
937 937 $ echo '[extensions]' >> $HGRCPATH
938 938 $ echo "dot.dot.prefixedname = `pwd`/prefixedname.py" >> $HGRCPATH
939 939 $ hg help -k clone
940 940 Topics:
941 941
942 942 config Configuration Files
943 943 extensions Using Additional Features
944 944 glossary Glossary
945 945 phases Working with Phases
946 946 subrepos Subrepositories
947 947 urls URL Paths
948 948
949 949 Commands:
950 950
951 951 bookmarks create a new bookmark or list existing bookmarks
952 952 clone make a copy of an existing repository
953 953 paths show aliases for remote repositories
954 954 update update working directory (or switch revisions)
955 955
956 956 Extensions:
957 957
958 958 prefixedname matched against word "clone"
959 959 relink recreates hardlinks between repository clones
960 960
961 961 Extension Commands:
962 962
963 963 qclone clone main and patch repository at same time
964 964
965 965 Test unfound topic
966 966
967 967 $ hg help nonexistingtopicthatwillneverexisteverever
968 968 abort: no such help topic: nonexistingtopicthatwillneverexisteverever
969 969 (try "hg help --keyword nonexistingtopicthatwillneverexisteverever")
970 970 [255]
971 971
972 972 Test unfound keyword
973 973
974 974 $ hg help --keyword nonexistingwordthatwillneverexisteverever
975 975 abort: no matches
976 976 (try "hg help" for a list of topics)
977 977 [255]
978 978
979 979 Test omit indicating for help
980 980
981 981 $ cat > addverboseitems.py <<EOF
982 982 > '''extension to test omit indicating.
983 983 >
984 984 > This paragraph is never omitted (for extension)
985 985 >
986 986 > .. container:: verbose
987 987 >
988 988 > This paragraph is omitted,
989 989 > if :hg:\`help\` is invoked without \`\`-v\`\` (for extension)
990 990 >
991 991 > This paragraph is never omitted, too (for extension)
992 992 > '''
993 993 >
994 994 > from mercurial import help, commands
995 995 > testtopic = """This paragraph is never omitted (for topic).
996 996 >
997 997 > .. container:: verbose
998 998 >
999 999 > This paragraph is omitted,
1000 1000 > if :hg:\`help\` is invoked without \`\`-v\`\` (for topic)
1001 1001 >
1002 1002 > This paragraph is never omitted, too (for topic)
1003 1003 > """
1004 1004 > def extsetup(ui):
1005 1005 > help.helptable.append((["topic-containing-verbose"],
1006 1006 > "This is the topic to test omit indicating.",
1007 1007 > lambda : testtopic))
1008 1008 > EOF
1009 1009 $ echo '[extensions]' >> $HGRCPATH
1010 1010 $ echo "addverboseitems = `pwd`/addverboseitems.py" >> $HGRCPATH
1011 1011 $ hg help addverboseitems
1012 1012 addverboseitems extension - extension to test omit indicating.
1013 1013
1014 1014 This paragraph is never omitted (for extension)
1015 1015
1016 1016 This paragraph is never omitted, too (for extension)
1017 1017
1018 1018 (some details hidden, use --verbose to show complete help)
1019 1019
1020 1020 no commands defined
1021 1021 $ hg help -v addverboseitems
1022 1022 addverboseitems extension - extension to test omit indicating.
1023 1023
1024 1024 This paragraph is never omitted (for extension)
1025 1025
1026 1026 This paragraph is omitted, if "hg help" is invoked without "-v" (for
1027 1027 extension)
1028 1028
1029 1029 This paragraph is never omitted, too (for extension)
1030 1030
1031 1031 no commands defined
1032 1032 $ hg help topic-containing-verbose
1033 1033 This is the topic to test omit indicating.
1034 1034 """"""""""""""""""""""""""""""""""""""""""
1035 1035
1036 1036 This paragraph is never omitted (for topic).
1037 1037
1038 1038 This paragraph is never omitted, too (for topic)
1039 1039
1040 1040 (some details hidden, use --verbose to show complete help)
1041 1041 $ hg help -v topic-containing-verbose
1042 1042 This is the topic to test omit indicating.
1043 1043 """"""""""""""""""""""""""""""""""""""""""
1044 1044
1045 1045 This paragraph is never omitted (for topic).
1046 1046
1047 1047 This paragraph is omitted, if "hg help" is invoked without "-v" (for
1048 1048 topic)
1049 1049
1050 1050 This paragraph is never omitted, too (for topic)
1051 1051
1052 1052 Test section lookup
1053 1053
1054 1054 $ hg help revset.merge
1055 1055 "merge()"
1056 1056 Changeset is a merge changeset.
1057 1057
1058 1058 $ hg help glossary.dag
1059 1059 DAG
1060 1060 The repository of changesets of a distributed version control system
1061 1061 (DVCS) can be described as a directed acyclic graph (DAG), consisting
1062 1062 of nodes and edges, where nodes correspond to changesets and edges
1063 1063 imply a parent -> child relation. This graph can be visualized by
1064 1064 graphical tools such as "hg log --graph". In Mercurial, the DAG is
1065 1065 limited by the requirement for children to have at most two parents.
1066 1066
1067 1067
1068 1068 $ hg help hgrc.paths
1069 1069 "paths"
1070 1070 -------
1071 1071
1072 1072 Assigns symbolic names to repositories. The left side is the symbolic
1073 1073 name, and the right gives the directory or URL that is the location of the
1074 1074 repository. Default paths can be declared by setting the following
1075 1075 entries.
1076 1076
1077 1077 "default"
1078 1078 Directory or URL to use when pulling if no source is specified.
1079 1079 Default is set to repository from which the current repository was
1080 1080 cloned.
1081 1081
1082 1082 "default-push"
1083 1083 Optional. Directory or URL to use when pushing if no destination is
1084 1084 specified.
1085 1085
1086 1086 Custom paths can be defined by assigning the path to a name that later can
1087 1087 be used from the command line. Example:
1088 1088
1089 1089 [paths]
1090 1090 my_path = http://example.com/path
1091 1091
1092 1092 To push to the path defined in "my_path" run the command:
1093 1093
1094 1094 hg push my_path
1095 1095
1096 1096 $ hg help glossary.mcguffin
1097 1097 abort: help section not found
1098 1098 [255]
1099 1099
1100 1100 $ hg help glossary.mc.guffin
1101 1101 abort: help section not found
1102 1102 [255]
1103 1103
1104 1104 Test dynamic list of merge tools only shows up once
1105 1105 $ hg help merge-tools
1106 1106 Merge Tools
1107 1107 """""""""""
1108 1108
1109 1109 To merge files Mercurial uses merge tools.
1110 1110
1111 1111 A merge tool combines two different versions of a file into a merged file.
1112 1112 Merge tools are given the two files and the greatest common ancestor of
1113 1113 the two file versions, so they can determine the changes made on both
1114 1114 branches.
1115 1115
1116 1116 Merge tools are used both for "hg resolve", "hg merge", "hg update", "hg
1117 1117 backout" and in several extensions.
1118 1118
1119 1119 Usually, the merge tool tries to automatically reconcile the files by
1120 1120 combining all non-overlapping changes that occurred separately in the two
1121 1121 different evolutions of the same initial base file. Furthermore, some
1122 1122 interactive merge programs make it easier to manually resolve conflicting
1123 1123 merges, either in a graphical way, or by inserting some conflict markers.
1124 1124 Mercurial does not include any interactive merge programs but relies on
1125 1125 external tools for that.
1126 1126
1127 1127 Available merge tools
1128 1128 =====================
1129 1129
1130 1130 External merge tools and their properties are configured in the merge-
1131 1131 tools configuration section - see hgrc(5) - but they can often just be
1132 1132 named by their executable.
1133 1133
1134 1134 A merge tool is generally usable if its executable can be found on the
1135 1135 system and if it can handle the merge. The executable is found if it is an
1136 1136 absolute or relative executable path or the name of an application in the
1137 1137 executable search path. The tool is assumed to be able to handle the merge
1138 1138 if it can handle symlinks if the file is a symlink, if it can handle
1139 1139 binary files if the file is binary, and if a GUI is available if the tool
1140 1140 requires a GUI.
1141 1141
1142 1142 There are some internal merge tools which can be used. The internal merge
1143 1143 tools are:
1144 1144
1145 1145 ":dump"
1146 1146 Creates three versions of the files to merge, containing the contents of
1147 1147 local, other and base. These files can then be used to perform a merge
1148 1148 manually. If the file to be merged is named "a.txt", these files will
1149 1149 accordingly be named "a.txt.local", "a.txt.other" and "a.txt.base" and
1150 1150 they will be placed in the same directory as "a.txt".
1151 1151
1152 1152 ":fail"
1153 1153 Rather than attempting to merge files that were modified on both
1154 1154 branches, it marks them as unresolved. The resolve command must be used
1155 1155 to resolve these conflicts.
1156 1156
1157 1157 ":local"
1158 1158 Uses the local version of files as the merged version.
1159 1159
1160 1160 ":merge"
1161 1161 Uses the internal non-interactive simple merge algorithm for merging
1162 1162 files. It will fail if there are any conflicts and leave markers in the
1163 1163 partially merged file. Markers will have two sections, one for each side
1164 1164 of merge.
1165 1165
1166 1166 ":merge3"
1167 1167 Uses the internal non-interactive simple merge algorithm for merging
1168 1168 files. It will fail if there are any conflicts and leave markers in the
1169 1169 partially merged file. Marker will have three sections, one from each
1170 1170 side of the merge and one for the base content.
1171 1171
1172 1172 ":other"
1173 1173 Uses the other version of files as the merged version.
1174 1174
1175 1175 ":prompt"
1176 1176 Asks the user which of the local or the other version to keep as the
1177 1177 merged version.
1178 1178
1179 1179 ":tagmerge"
1180 1180 Uses the internal tag merge algorithm (experimental).
1181 1181
1182 1182 Internal tools are always available and do not require a GUI but will by
1183 1183 default not handle symlinks or binary files.
1184 1184
1185 1185 Choosing a merge tool
1186 1186 =====================
1187 1187
1188 1188 Mercurial uses these rules when deciding which merge tool to use:
1189 1189
1190 1190 1. If a tool has been specified with the --tool option to merge or
1191 1191 resolve, it is used. If it is the name of a tool in the merge-tools
1192 1192 configuration, its configuration is used. Otherwise the specified tool
1193 1193 must be executable by the shell.
1194 1194 2. If the "HGMERGE" environment variable is present, its value is used and
1195 1195 must be executable by the shell.
1196 1196 3. If the filename of the file to be merged matches any of the patterns in
1197 1197 the merge-patterns configuration section, the first usable merge tool
1198 1198 corresponding to a matching pattern is used. Here, binary capabilities
1199 1199 of the merge tool are not considered.
1200 1200 4. If ui.merge is set it will be considered next. If the value is not the
1201 1201 name of a configured tool, the specified value is used and must be
1202 1202 executable by the shell. Otherwise the named tool is used if it is
1203 1203 usable.
1204 1204 5. If any usable merge tools are present in the merge-tools configuration
1205 1205 section, the one with the highest priority is used.
1206 1206 6. If a program named "hgmerge" can be found on the system, it is used -
1207 1207 but it will by default not be used for symlinks and binary files.
1208 1208 7. If the file to be merged is not binary and is not a symlink, then
1209 1209 internal ":merge" is used.
1210 1210 8. The merge of the file fails and must be resolved before commit.
1211 1211
1212 1212 Note:
1213 1213 After selecting a merge program, Mercurial will by default attempt to
1214 1214 merge the files using a simple merge algorithm first. Only if it
1215 1215 doesn't succeed because of conflicting changes Mercurial will actually
1216 1216 execute the merge program. Whether to use the simple merge algorithm
1217 1217 first can be controlled by the premerge setting of the merge tool.
1218 1218 Premerge is enabled by default unless the file is binary or a symlink.
1219 1219
1220 1220 See the merge-tools and ui sections of hgrc(5) for details on the
1221 1221 configuration of merge tools.
1222 1222
1223 1223 Test usage of section marks in help documents
1224 1224
1225 1225 $ cd "$TESTDIR"/../doc
1226 1226 $ python check-seclevel.py
1227 1227 $ cd $TESTTMP
1228 1228
1229 1229 #if serve
1230 1230
1231 1231 Test the help pages in hgweb.
1232 1232
1233 1233 Dish up an empty repo; serve it cold.
1234 1234
1235 1235 $ hg init "$TESTTMP/test"
1236 1236 $ hg serve -R "$TESTTMP/test" -n test -p $HGPORT -d --pid-file=hg.pid
1237 1237 $ cat hg.pid >> $DAEMON_PIDS
1238 1238
1239 1239 $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT "help"
1240 1240 200 Script output follows
1241 1241
1242 1242 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
1243 1243 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
1244 1244 <head>
1245 1245 <link rel="icon" href="/static/hgicon.png" type="image/png" />
1246 1246 <meta name="robots" content="index, nofollow" />
1247 1247 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
1248 1248 <script type="text/javascript" src="/static/mercurial.js"></script>
1249 1249
1250 1250 <title>Help: Index</title>
1251 1251 </head>
1252 1252 <body>
1253 1253
1254 1254 <div class="container">
1255 1255 <div class="menu">
1256 1256 <div class="logo">
1257 1257 <a href="http://mercurial.selenic.com/">
1258 1258 <img src="/static/hglogo.png" alt="mercurial" /></a>
1259 1259 </div>
1260 1260 <ul>
1261 1261 <li><a href="/shortlog">log</a></li>
1262 1262 <li><a href="/graph">graph</a></li>
1263 1263 <li><a href="/tags">tags</a></li>
1264 1264 <li><a href="/bookmarks">bookmarks</a></li>
1265 1265 <li><a href="/branches">branches</a></li>
1266 1266 </ul>
1267 1267 <ul>
1268 1268 <li class="active">help</li>
1269 1269 </ul>
1270 1270 </div>
1271 1271
1272 1272 <div class="main">
1273 1273 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
1274 1274 <form class="search" action="/log">
1275 1275
1276 1276 <p><input name="rev" id="search1" type="text" size="30" /></p>
1277 1277 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
1278 1278 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
1279 1279 </form>
1280 1280 <table class="bigtable">
1281 1281 <tr><td colspan="2"><h2><a name="main" href="#topics">Topics</a></h2></td></tr>
1282 1282
1283 1283 <tr><td>
1284 1284 <a href="/help/config">
1285 1285 config
1286 1286 </a>
1287 1287 </td><td>
1288 1288 Configuration Files
1289 1289 </td></tr>
1290 1290 <tr><td>
1291 1291 <a href="/help/dates">
1292 1292 dates
1293 1293 </a>
1294 1294 </td><td>
1295 1295 Date Formats
1296 1296 </td></tr>
1297 1297 <tr><td>
1298 1298 <a href="/help/diffs">
1299 1299 diffs
1300 1300 </a>
1301 1301 </td><td>
1302 1302 Diff Formats
1303 1303 </td></tr>
1304 1304 <tr><td>
1305 1305 <a href="/help/environment">
1306 1306 environment
1307 1307 </a>
1308 1308 </td><td>
1309 1309 Environment Variables
1310 1310 </td></tr>
1311 1311 <tr><td>
1312 1312 <a href="/help/extensions">
1313 1313 extensions
1314 1314 </a>
1315 1315 </td><td>
1316 1316 Using Additional Features
1317 1317 </td></tr>
1318 1318 <tr><td>
1319 1319 <a href="/help/filesets">
1320 1320 filesets
1321 1321 </a>
1322 1322 </td><td>
1323 1323 Specifying File Sets
1324 1324 </td></tr>
1325 1325 <tr><td>
1326 1326 <a href="/help/glossary">
1327 1327 glossary
1328 1328 </a>
1329 1329 </td><td>
1330 1330 Glossary
1331 1331 </td></tr>
1332 1332 <tr><td>
1333 1333 <a href="/help/hgignore">
1334 1334 hgignore
1335 1335 </a>
1336 1336 </td><td>
1337 1337 Syntax for Mercurial Ignore Files
1338 1338 </td></tr>
1339 1339 <tr><td>
1340 1340 <a href="/help/hgweb">
1341 1341 hgweb
1342 1342 </a>
1343 1343 </td><td>
1344 1344 Configuring hgweb
1345 1345 </td></tr>
1346 1346 <tr><td>
1347 1347 <a href="/help/merge-tools">
1348 1348 merge-tools
1349 1349 </a>
1350 1350 </td><td>
1351 1351 Merge Tools
1352 1352 </td></tr>
1353 1353 <tr><td>
1354 1354 <a href="/help/multirevs">
1355 1355 multirevs
1356 1356 </a>
1357 1357 </td><td>
1358 1358 Specifying Multiple Revisions
1359 1359 </td></tr>
1360 1360 <tr><td>
1361 1361 <a href="/help/patterns">
1362 1362 patterns
1363 1363 </a>
1364 1364 </td><td>
1365 1365 File Name Patterns
1366 1366 </td></tr>
1367 1367 <tr><td>
1368 1368 <a href="/help/phases">
1369 1369 phases
1370 1370 </a>
1371 1371 </td><td>
1372 1372 Working with Phases
1373 1373 </td></tr>
1374 1374 <tr><td>
1375 1375 <a href="/help/revisions">
1376 1376 revisions
1377 1377 </a>
1378 1378 </td><td>
1379 1379 Specifying Single Revisions
1380 1380 </td></tr>
1381 1381 <tr><td>
1382 1382 <a href="/help/revsets">
1383 1383 revsets
1384 1384 </a>
1385 1385 </td><td>
1386 1386 Specifying Revision Sets
1387 1387 </td></tr>
1388 1388 <tr><td>
1389 1389 <a href="/help/subrepos">
1390 1390 subrepos
1391 1391 </a>
1392 1392 </td><td>
1393 1393 Subrepositories
1394 1394 </td></tr>
1395 1395 <tr><td>
1396 1396 <a href="/help/templating">
1397 1397 templating
1398 1398 </a>
1399 1399 </td><td>
1400 1400 Template Usage
1401 1401 </td></tr>
1402 1402 <tr><td>
1403 1403 <a href="/help/urls">
1404 1404 urls
1405 1405 </a>
1406 1406 </td><td>
1407 1407 URL Paths
1408 1408 </td></tr>
1409 1409 <tr><td>
1410 1410 <a href="/help/topic-containing-verbose">
1411 1411 topic-containing-verbose
1412 1412 </a>
1413 1413 </td><td>
1414 1414 This is the topic to test omit indicating.
1415 1415 </td></tr>
1416 1416
1417 1417 <tr><td colspan="2"><h2><a name="main" href="#main">Main Commands</a></h2></td></tr>
1418 1418
1419 1419 <tr><td>
1420 1420 <a href="/help/add">
1421 1421 add
1422 1422 </a>
1423 1423 </td><td>
1424 1424 add the specified files on the next commit
1425 1425 </td></tr>
1426 1426 <tr><td>
1427 1427 <a href="/help/annotate">
1428 1428 annotate
1429 1429 </a>
1430 1430 </td><td>
1431 1431 show changeset information by line for each file
1432 1432 </td></tr>
1433 1433 <tr><td>
1434 1434 <a href="/help/clone">
1435 1435 clone
1436 1436 </a>
1437 1437 </td><td>
1438 1438 make a copy of an existing repository
1439 1439 </td></tr>
1440 1440 <tr><td>
1441 1441 <a href="/help/commit">
1442 1442 commit
1443 1443 </a>
1444 1444 </td><td>
1445 1445 commit the specified files or all outstanding changes
1446 1446 </td></tr>
1447 1447 <tr><td>
1448 1448 <a href="/help/diff">
1449 1449 diff
1450 1450 </a>
1451 1451 </td><td>
1452 1452 diff repository (or selected files)
1453 1453 </td></tr>
1454 1454 <tr><td>
1455 1455 <a href="/help/export">
1456 1456 export
1457 1457 </a>
1458 1458 </td><td>
1459 1459 dump the header and diffs for one or more changesets
1460 1460 </td></tr>
1461 1461 <tr><td>
1462 1462 <a href="/help/forget">
1463 1463 forget
1464 1464 </a>
1465 1465 </td><td>
1466 1466 forget the specified files on the next commit
1467 1467 </td></tr>
1468 1468 <tr><td>
1469 1469 <a href="/help/init">
1470 1470 init
1471 1471 </a>
1472 1472 </td><td>
1473 1473 create a new repository in the given directory
1474 1474 </td></tr>
1475 1475 <tr><td>
1476 1476 <a href="/help/log">
1477 1477 log
1478 1478 </a>
1479 1479 </td><td>
1480 1480 show revision history of entire repository or files
1481 1481 </td></tr>
1482 1482 <tr><td>
1483 1483 <a href="/help/merge">
1484 1484 merge
1485 1485 </a>
1486 1486 </td><td>
1487 1487 merge another revision into working directory
1488 1488 </td></tr>
1489 1489 <tr><td>
1490 1490 <a href="/help/pull">
1491 1491 pull
1492 1492 </a>
1493 1493 </td><td>
1494 1494 pull changes from the specified source
1495 1495 </td></tr>
1496 1496 <tr><td>
1497 1497 <a href="/help/push">
1498 1498 push
1499 1499 </a>
1500 1500 </td><td>
1501 1501 push changes to the specified destination
1502 1502 </td></tr>
1503 1503 <tr><td>
1504 1504 <a href="/help/remove">
1505 1505 remove
1506 1506 </a>
1507 1507 </td><td>
1508 1508 remove the specified files on the next commit
1509 1509 </td></tr>
1510 1510 <tr><td>
1511 1511 <a href="/help/serve">
1512 1512 serve
1513 1513 </a>
1514 1514 </td><td>
1515 1515 start stand-alone webserver
1516 1516 </td></tr>
1517 1517 <tr><td>
1518 1518 <a href="/help/status">
1519 1519 status
1520 1520 </a>
1521 1521 </td><td>
1522 1522 show changed files in the working directory
1523 1523 </td></tr>
1524 1524 <tr><td>
1525 1525 <a href="/help/summary">
1526 1526 summary
1527 1527 </a>
1528 1528 </td><td>
1529 1529 summarize working directory state
1530 1530 </td></tr>
1531 1531 <tr><td>
1532 1532 <a href="/help/update">
1533 1533 update
1534 1534 </a>
1535 1535 </td><td>
1536 1536 update working directory (or switch revisions)
1537 1537 </td></tr>
1538 1538
1539 1539 <tr><td colspan="2"><h2><a name="other" href="#other">Other Commands</a></h2></td></tr>
1540 1540
1541 1541 <tr><td>
1542 1542 <a href="/help/addremove">
1543 1543 addremove
1544 1544 </a>
1545 1545 </td><td>
1546 1546 add all new files, delete all missing files
1547 1547 </td></tr>
1548 1548 <tr><td>
1549 1549 <a href="/help/archive">
1550 1550 archive
1551 1551 </a>
1552 1552 </td><td>
1553 1553 create an unversioned archive of a repository revision
1554 1554 </td></tr>
1555 1555 <tr><td>
1556 1556 <a href="/help/backout">
1557 1557 backout
1558 1558 </a>
1559 1559 </td><td>
1560 1560 reverse effect of earlier changeset
1561 1561 </td></tr>
1562 1562 <tr><td>
1563 1563 <a href="/help/bisect">
1564 1564 bisect
1565 1565 </a>
1566 1566 </td><td>
1567 1567 subdivision search of changesets
1568 1568 </td></tr>
1569 1569 <tr><td>
1570 1570 <a href="/help/bookmarks">
1571 1571 bookmarks
1572 1572 </a>
1573 1573 </td><td>
1574 1574 create a new bookmark or list existing bookmarks
1575 1575 </td></tr>
1576 1576 <tr><td>
1577 1577 <a href="/help/branch">
1578 1578 branch
1579 1579 </a>
1580 1580 </td><td>
1581 1581 set or show the current branch name
1582 1582 </td></tr>
1583 1583 <tr><td>
1584 1584 <a href="/help/branches">
1585 1585 branches
1586 1586 </a>
1587 1587 </td><td>
1588 1588 list repository named branches
1589 1589 </td></tr>
1590 1590 <tr><td>
1591 1591 <a href="/help/bundle">
1592 1592 bundle
1593 1593 </a>
1594 1594 </td><td>
1595 1595 create a changegroup file
1596 1596 </td></tr>
1597 1597 <tr><td>
1598 1598 <a href="/help/cat">
1599 1599 cat
1600 1600 </a>
1601 1601 </td><td>
1602 1602 output the current or given revision of files
1603 1603 </td></tr>
1604 1604 <tr><td>
1605 1605 <a href="/help/config">
1606 1606 config
1607 1607 </a>
1608 1608 </td><td>
1609 1609 show combined config settings from all hgrc files
1610 1610 </td></tr>
1611 1611 <tr><td>
1612 1612 <a href="/help/copy">
1613 1613 copy
1614 1614 </a>
1615 1615 </td><td>
1616 1616 mark files as copied for the next commit
1617 1617 </td></tr>
1618 1618 <tr><td>
1619 1619 <a href="/help/files">
1620 1620 files
1621 1621 </a>
1622 1622 </td><td>
1623 1623 list tracked files
1624 1624 </td></tr>
1625 1625 <tr><td>
1626 1626 <a href="/help/graft">
1627 1627 graft
1628 1628 </a>
1629 1629 </td><td>
1630 1630 copy changes from other branches onto the current branch
1631 1631 </td></tr>
1632 1632 <tr><td>
1633 1633 <a href="/help/grep">
1634 1634 grep
1635 1635 </a>
1636 1636 </td><td>
1637 1637 search for a pattern in specified files and revisions
1638 1638 </td></tr>
1639 1639 <tr><td>
1640 1640 <a href="/help/heads">
1641 1641 heads
1642 1642 </a>
1643 1643 </td><td>
1644 1644 show branch heads
1645 1645 </td></tr>
1646 1646 <tr><td>
1647 1647 <a href="/help/help">
1648 1648 help
1649 1649 </a>
1650 1650 </td><td>
1651 1651 show help for a given topic or a help overview
1652 1652 </td></tr>
1653 1653 <tr><td>
1654 1654 <a href="/help/identify">
1655 1655 identify
1656 1656 </a>
1657 1657 </td><td>
1658 1658 identify the working copy or specified revision
1659 1659 </td></tr>
1660 1660 <tr><td>
1661 1661 <a href="/help/import">
1662 1662 import
1663 1663 </a>
1664 1664 </td><td>
1665 1665 import an ordered set of patches
1666 1666 </td></tr>
1667 1667 <tr><td>
1668 1668 <a href="/help/incoming">
1669 1669 incoming
1670 1670 </a>
1671 1671 </td><td>
1672 1672 show new changesets found in source
1673 1673 </td></tr>
1674 1674 <tr><td>
1675 1675 <a href="/help/manifest">
1676 1676 manifest
1677 1677 </a>
1678 1678 </td><td>
1679 1679 output the current or given revision of the project manifest
1680 1680 </td></tr>
1681 1681 <tr><td>
1682 1682 <a href="/help/nohelp">
1683 1683 nohelp
1684 1684 </a>
1685 1685 </td><td>
1686 1686 (no help text available)
1687 1687 </td></tr>
1688 1688 <tr><td>
1689 1689 <a href="/help/outgoing">
1690 1690 outgoing
1691 1691 </a>
1692 1692 </td><td>
1693 1693 show changesets not found in the destination
1694 1694 </td></tr>
1695 1695 <tr><td>
1696 1696 <a href="/help/paths">
1697 1697 paths
1698 1698 </a>
1699 1699 </td><td>
1700 1700 show aliases for remote repositories
1701 1701 </td></tr>
1702 1702 <tr><td>
1703 1703 <a href="/help/phase">
1704 1704 phase
1705 1705 </a>
1706 1706 </td><td>
1707 1707 set or show the current phase name
1708 1708 </td></tr>
1709 1709 <tr><td>
1710 1710 <a href="/help/recover">
1711 1711 recover
1712 1712 </a>
1713 1713 </td><td>
1714 1714 roll back an interrupted transaction
1715 1715 </td></tr>
1716 1716 <tr><td>
1717 1717 <a href="/help/rename">
1718 1718 rename
1719 1719 </a>
1720 1720 </td><td>
1721 1721 rename files; equivalent of copy + remove
1722 1722 </td></tr>
1723 1723 <tr><td>
1724 1724 <a href="/help/resolve">
1725 1725 resolve
1726 1726 </a>
1727 1727 </td><td>
1728 1728 redo merges or set/view the merge status of files
1729 1729 </td></tr>
1730 1730 <tr><td>
1731 1731 <a href="/help/revert">
1732 1732 revert
1733 1733 </a>
1734 1734 </td><td>
1735 1735 restore files to their checkout state
1736 1736 </td></tr>
1737 1737 <tr><td>
1738 1738 <a href="/help/root">
1739 1739 root
1740 1740 </a>
1741 1741 </td><td>
1742 1742 print the root (top) of the current working directory
1743 1743 </td></tr>
1744 1744 <tr><td>
1745 1745 <a href="/help/tag">
1746 1746 tag
1747 1747 </a>
1748 1748 </td><td>
1749 1749 add one or more tags for the current or given revision
1750 1750 </td></tr>
1751 1751 <tr><td>
1752 1752 <a href="/help/tags">
1753 1753 tags
1754 1754 </a>
1755 1755 </td><td>
1756 1756 list repository tags
1757 1757 </td></tr>
1758 1758 <tr><td>
1759 1759 <a href="/help/unbundle">
1760 1760 unbundle
1761 1761 </a>
1762 1762 </td><td>
1763 1763 apply one or more changegroup files
1764 1764 </td></tr>
1765 1765 <tr><td>
1766 1766 <a href="/help/verify">
1767 1767 verify
1768 1768 </a>
1769 1769 </td><td>
1770 1770 verify the integrity of the repository
1771 1771 </td></tr>
1772 1772 <tr><td>
1773 1773 <a href="/help/version">
1774 1774 version
1775 1775 </a>
1776 1776 </td><td>
1777 1777 output version and copyright information
1778 1778 </td></tr>
1779 1779 </table>
1780 1780 </div>
1781 1781 </div>
1782 1782
1783 1783 <script type="text/javascript">process_dates()</script>
1784 1784
1785 1785
1786 1786 </body>
1787 1787 </html>
1788 1788
1789 1789
1790 1790 $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT "help/add"
1791 1791 200 Script output follows
1792 1792
1793 1793 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
1794 1794 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
1795 1795 <head>
1796 1796 <link rel="icon" href="/static/hgicon.png" type="image/png" />
1797 1797 <meta name="robots" content="index, nofollow" />
1798 1798 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
1799 1799 <script type="text/javascript" src="/static/mercurial.js"></script>
1800 1800
1801 1801 <title>Help: add</title>
1802 1802 </head>
1803 1803 <body>
1804 1804
1805 1805 <div class="container">
1806 1806 <div class="menu">
1807 1807 <div class="logo">
1808 1808 <a href="http://mercurial.selenic.com/">
1809 1809 <img src="/static/hglogo.png" alt="mercurial" /></a>
1810 1810 </div>
1811 1811 <ul>
1812 1812 <li><a href="/shortlog">log</a></li>
1813 1813 <li><a href="/graph">graph</a></li>
1814 1814 <li><a href="/tags">tags</a></li>
1815 1815 <li><a href="/bookmarks">bookmarks</a></li>
1816 1816 <li><a href="/branches">branches</a></li>
1817 1817 </ul>
1818 1818 <ul>
1819 1819 <li class="active"><a href="/help">help</a></li>
1820 1820 </ul>
1821 1821 </div>
1822 1822
1823 1823 <div class="main">
1824 1824 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
1825 1825 <h3>Help: add</h3>
1826 1826
1827 1827 <form class="search" action="/log">
1828 1828
1829 1829 <p><input name="rev" id="search1" type="text" size="30" /></p>
1830 1830 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
1831 1831 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
1832 1832 </form>
1833 1833 <div id="doc">
1834 1834 <p>
1835 1835 hg add [OPTION]... [FILE]...
1836 1836 </p>
1837 1837 <p>
1838 1838 add the specified files on the next commit
1839 1839 </p>
1840 1840 <p>
1841 1841 Schedule files to be version controlled and added to the
1842 1842 repository.
1843 1843 </p>
1844 1844 <p>
1845 1845 The files will be added to the repository at the next commit. To
1846 1846 undo an add before that, see &quot;hg forget&quot;.
1847 1847 </p>
1848 1848 <p>
1849 1849 If no names are given, add all files to the repository.
1850 1850 </p>
1851 1851 <p>
1852 1852 An example showing how new (unknown) files are added
1853 1853 automatically by &quot;hg add&quot;:
1854 1854 </p>
1855 1855 <pre>
1856 1856 \$ ls (re)
1857 1857 foo.c
1858 1858 \$ hg status (re)
1859 1859 ? foo.c
1860 1860 \$ hg add (re)
1861 1861 adding foo.c
1862 1862 \$ hg status (re)
1863 1863 A foo.c
1864 1864 </pre>
1865 1865 <p>
1866 1866 Returns 0 if all files are successfully added.
1867 1867 </p>
1868 1868 <p>
1869 1869 options ([+] can be repeated):
1870 1870 </p>
1871 1871 <table>
1872 1872 <tr><td>-I</td>
1873 1873 <td>--include PATTERN [+]</td>
1874 1874 <td>include names matching the given patterns</td></tr>
1875 1875 <tr><td>-X</td>
1876 1876 <td>--exclude PATTERN [+]</td>
1877 1877 <td>exclude names matching the given patterns</td></tr>
1878 1878 <tr><td>-S</td>
1879 1879 <td>--subrepos</td>
1880 1880 <td>recurse into subrepositories</td></tr>
1881 1881 <tr><td>-n</td>
1882 1882 <td>--dry-run</td>
1883 1883 <td>do not perform actions, just print output</td></tr>
1884 1884 </table>
1885 1885 <p>
1886 1886 global options ([+] can be repeated):
1887 1887 </p>
1888 1888 <table>
1889 1889 <tr><td>-R</td>
1890 1890 <td>--repository REPO</td>
1891 1891 <td>repository root directory or name of overlay bundle file</td></tr>
1892 1892 <tr><td></td>
1893 1893 <td>--cwd DIR</td>
1894 1894 <td>change working directory</td></tr>
1895 1895 <tr><td>-y</td>
1896 1896 <td>--noninteractive</td>
1897 1897 <td>do not prompt, automatically pick the first choice for all prompts</td></tr>
1898 1898 <tr><td>-q</td>
1899 1899 <td>--quiet</td>
1900 1900 <td>suppress output</td></tr>
1901 1901 <tr><td>-v</td>
1902 1902 <td>--verbose</td>
1903 1903 <td>enable additional output</td></tr>
1904 1904 <tr><td></td>
1905 1905 <td>--config CONFIG [+]</td>
1906 1906 <td>set/override config option (use 'section.name=value')</td></tr>
1907 1907 <tr><td></td>
1908 1908 <td>--debug</td>
1909 1909 <td>enable debugging output</td></tr>
1910 1910 <tr><td></td>
1911 1911 <td>--debugger</td>
1912 1912 <td>start debugger</td></tr>
1913 1913 <tr><td></td>
1914 1914 <td>--encoding ENCODE</td>
1915 1915 <td>set the charset encoding (default: ascii)</td></tr>
1916 1916 <tr><td></td>
1917 1917 <td>--encodingmode MODE</td>
1918 1918 <td>set the charset encoding mode (default: strict)</td></tr>
1919 1919 <tr><td></td>
1920 1920 <td>--traceback</td>
1921 1921 <td>always print a traceback on exception</td></tr>
1922 1922 <tr><td></td>
1923 1923 <td>--time</td>
1924 1924 <td>time how long the command takes</td></tr>
1925 1925 <tr><td></td>
1926 1926 <td>--profile</td>
1927 1927 <td>print command execution profile</td></tr>
1928 1928 <tr><td></td>
1929 1929 <td>--version</td>
1930 1930 <td>output version information and exit</td></tr>
1931 1931 <tr><td>-h</td>
1932 1932 <td>--help</td>
1933 1933 <td>display help and exit</td></tr>
1934 1934 <tr><td></td>
1935 1935 <td>--hidden</td>
1936 1936 <td>consider hidden changesets</td></tr>
1937 1937 </table>
1938 1938
1939 1939 </div>
1940 1940 </div>
1941 1941 </div>
1942 1942
1943 1943 <script type="text/javascript">process_dates()</script>
1944 1944
1945 1945
1946 1946 </body>
1947 1947 </html>
1948 1948
1949 1949
1950 1950 $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT "help/remove"
1951 1951 200 Script output follows
1952 1952
1953 1953 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
1954 1954 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
1955 1955 <head>
1956 1956 <link rel="icon" href="/static/hgicon.png" type="image/png" />
1957 1957 <meta name="robots" content="index, nofollow" />
1958 1958 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
1959 1959 <script type="text/javascript" src="/static/mercurial.js"></script>
1960 1960
1961 1961 <title>Help: remove</title>
1962 1962 </head>
1963 1963 <body>
1964 1964
1965 1965 <div class="container">
1966 1966 <div class="menu">
1967 1967 <div class="logo">
1968 1968 <a href="http://mercurial.selenic.com/">
1969 1969 <img src="/static/hglogo.png" alt="mercurial" /></a>
1970 1970 </div>
1971 1971 <ul>
1972 1972 <li><a href="/shortlog">log</a></li>
1973 1973 <li><a href="/graph">graph</a></li>
1974 1974 <li><a href="/tags">tags</a></li>
1975 1975 <li><a href="/bookmarks">bookmarks</a></li>
1976 1976 <li><a href="/branches">branches</a></li>
1977 1977 </ul>
1978 1978 <ul>
1979 1979 <li class="active"><a href="/help">help</a></li>
1980 1980 </ul>
1981 1981 </div>
1982 1982
1983 1983 <div class="main">
1984 1984 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
1985 1985 <h3>Help: remove</h3>
1986 1986
1987 1987 <form class="search" action="/log">
1988 1988
1989 1989 <p><input name="rev" id="search1" type="text" size="30" /></p>
1990 1990 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
1991 1991 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
1992 1992 </form>
1993 1993 <div id="doc">
1994 1994 <p>
1995 1995 hg remove [OPTION]... FILE...
1996 1996 </p>
1997 1997 <p>
1998 1998 aliases: rm
1999 1999 </p>
2000 2000 <p>
2001 2001 remove the specified files on the next commit
2002 2002 </p>
2003 2003 <p>
2004 2004 Schedule the indicated files for removal from the current branch.
2005 2005 </p>
2006 2006 <p>
2007 2007 This command schedules the files to be removed at the next commit.
2008 2008 To undo a remove before that, see &quot;hg revert&quot;. To undo added
2009 2009 files, see &quot;hg forget&quot;.
2010 2010 </p>
2011 2011 <p>
2012 2012 -A/--after can be used to remove only files that have already
2013 2013 been deleted, -f/--force can be used to force deletion, and -Af
2014 2014 can be used to remove files from the next revision without
2015 2015 deleting them from the working directory.
2016 2016 </p>
2017 2017 <p>
2018 2018 The following table details the behavior of remove for different
2019 2019 file states (columns) and option combinations (rows). The file
2020 2020 states are Added [A], Clean [C], Modified [M] and Missing [!]
2021 2021 (as reported by &quot;hg status&quot;). The actions are Warn, Remove
2022 2022 (from branch) and Delete (from disk):
2023 2023 </p>
2024 2024 <table>
2025 2025 <tr><td>opt/state</td>
2026 2026 <td>A</td>
2027 2027 <td>C</td>
2028 2028 <td>M</td>
2029 2029 <td>!</td></tr>
2030 2030 <tr><td>none</td>
2031 2031 <td>W</td>
2032 2032 <td>RD</td>
2033 2033 <td>W</td>
2034 2034 <td>R</td></tr>
2035 2035 <tr><td>-f</td>
2036 2036 <td>R</td>
2037 2037 <td>RD</td>
2038 2038 <td>RD</td>
2039 2039 <td>R</td></tr>
2040 2040 <tr><td>-A</td>
2041 2041 <td>W</td>
2042 2042 <td>W</td>
2043 2043 <td>W</td>
2044 2044 <td>R</td></tr>
2045 2045 <tr><td>-Af</td>
2046 2046 <td>R</td>
2047 2047 <td>R</td>
2048 2048 <td>R</td>
2049 2049 <td>R</td></tr>
2050 2050 </table>
2051 2051 <p>
2052 2052 Note that remove never deletes files in Added [A] state from the
2053 2053 working directory, not even if option --force is specified.
2054 2054 </p>
2055 2055 <p>
2056 2056 Returns 0 on success, 1 if any warnings encountered.
2057 2057 </p>
2058 2058 <p>
2059 2059 options ([+] can be repeated):
2060 2060 </p>
2061 2061 <table>
2062 2062 <tr><td>-A</td>
2063 2063 <td>--after</td>
2064 2064 <td>record delete for missing files</td></tr>
2065 2065 <tr><td>-f</td>
2066 2066 <td>--force</td>
2067 2067 <td>remove (and delete) file even if added or modified</td></tr>
2068 2068 <tr><td>-S</td>
2069 2069 <td>--subrepos</td>
2070 2070 <td>recurse into subrepositories</td></tr>
2071 2071 <tr><td>-I</td>
2072 2072 <td>--include PATTERN [+]</td>
2073 2073 <td>include names matching the given patterns</td></tr>
2074 2074 <tr><td>-X</td>
2075 2075 <td>--exclude PATTERN [+]</td>
2076 2076 <td>exclude names matching the given patterns</td></tr>
2077 2077 </table>
2078 2078 <p>
2079 2079 global options ([+] can be repeated):
2080 2080 </p>
2081 2081 <table>
2082 2082 <tr><td>-R</td>
2083 2083 <td>--repository REPO</td>
2084 2084 <td>repository root directory or name of overlay bundle file</td></tr>
2085 2085 <tr><td></td>
2086 2086 <td>--cwd DIR</td>
2087 2087 <td>change working directory</td></tr>
2088 2088 <tr><td>-y</td>
2089 2089 <td>--noninteractive</td>
2090 2090 <td>do not prompt, automatically pick the first choice for all prompts</td></tr>
2091 2091 <tr><td>-q</td>
2092 2092 <td>--quiet</td>
2093 2093 <td>suppress output</td></tr>
2094 2094 <tr><td>-v</td>
2095 2095 <td>--verbose</td>
2096 2096 <td>enable additional output</td></tr>
2097 2097 <tr><td></td>
2098 2098 <td>--config CONFIG [+]</td>
2099 2099 <td>set/override config option (use 'section.name=value')</td></tr>
2100 2100 <tr><td></td>
2101 2101 <td>--debug</td>
2102 2102 <td>enable debugging output</td></tr>
2103 2103 <tr><td></td>
2104 2104 <td>--debugger</td>
2105 2105 <td>start debugger</td></tr>
2106 2106 <tr><td></td>
2107 2107 <td>--encoding ENCODE</td>
2108 2108 <td>set the charset encoding (default: ascii)</td></tr>
2109 2109 <tr><td></td>
2110 2110 <td>--encodingmode MODE</td>
2111 2111 <td>set the charset encoding mode (default: strict)</td></tr>
2112 2112 <tr><td></td>
2113 2113 <td>--traceback</td>
2114 2114 <td>always print a traceback on exception</td></tr>
2115 2115 <tr><td></td>
2116 2116 <td>--time</td>
2117 2117 <td>time how long the command takes</td></tr>
2118 2118 <tr><td></td>
2119 2119 <td>--profile</td>
2120 2120 <td>print command execution profile</td></tr>
2121 2121 <tr><td></td>
2122 2122 <td>--version</td>
2123 2123 <td>output version information and exit</td></tr>
2124 2124 <tr><td>-h</td>
2125 2125 <td>--help</td>
2126 2126 <td>display help and exit</td></tr>
2127 2127 <tr><td></td>
2128 2128 <td>--hidden</td>
2129 2129 <td>consider hidden changesets</td></tr>
2130 2130 </table>
2131 2131
2132 2132 </div>
2133 2133 </div>
2134 2134 </div>
2135 2135
2136 2136 <script type="text/javascript">process_dates()</script>
2137 2137
2138 2138
2139 2139 </body>
2140 2140 </html>
2141 2141
2142 2142
2143 2143 $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT "help/revisions"
2144 2144 200 Script output follows
2145 2145
2146 2146 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2147 2147 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
2148 2148 <head>
2149 2149 <link rel="icon" href="/static/hgicon.png" type="image/png" />
2150 2150 <meta name="robots" content="index, nofollow" />
2151 2151 <link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
2152 2152 <script type="text/javascript" src="/static/mercurial.js"></script>
2153 2153
2154 2154 <title>Help: revisions</title>
2155 2155 </head>
2156 2156 <body>
2157 2157
2158 2158 <div class="container">
2159 2159 <div class="menu">
2160 2160 <div class="logo">
2161 2161 <a href="http://mercurial.selenic.com/">
2162 2162 <img src="/static/hglogo.png" alt="mercurial" /></a>
2163 2163 </div>
2164 2164 <ul>
2165 2165 <li><a href="/shortlog">log</a></li>
2166 2166 <li><a href="/graph">graph</a></li>
2167 2167 <li><a href="/tags">tags</a></li>
2168 2168 <li><a href="/bookmarks">bookmarks</a></li>
2169 2169 <li><a href="/branches">branches</a></li>
2170 2170 </ul>
2171 2171 <ul>
2172 2172 <li class="active"><a href="/help">help</a></li>
2173 2173 </ul>
2174 2174 </div>
2175 2175
2176 2176 <div class="main">
2177 2177 <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
2178 2178 <h3>Help: revisions</h3>
2179 2179
2180 2180 <form class="search" action="/log">
2181 2181
2182 2182 <p><input name="rev" id="search1" type="text" size="30" /></p>
2183 2183 <div id="hint">Find changesets by keywords (author, files, the commit message), revision
2184 2184 number or hash, or <a href="/help/revsets">revset expression</a>.</div>
2185 2185 </form>
2186 2186 <div id="doc">
2187 2187 <h1>Specifying Single Revisions</h1>
2188 2188 <p>
2189 2189 Mercurial supports several ways to specify individual revisions.
2190 2190 </p>
2191 2191 <p>
2192 2192 A plain integer is treated as a revision number. Negative integers are
2193 2193 treated as sequential offsets from the tip, with -1 denoting the tip,
2194 2194 -2 denoting the revision prior to the tip, and so forth.
2195 2195 </p>
2196 2196 <p>
2197 2197 A 40-digit hexadecimal string is treated as a unique revision
2198 2198 identifier.
2199 2199 </p>
2200 2200 <p>
2201 2201 A hexadecimal string less than 40 characters long is treated as a
2202 2202 unique revision identifier and is referred to as a short-form
2203 2203 identifier. A short-form identifier is only valid if it is the prefix
2204 2204 of exactly one full-length identifier.
2205 2205 </p>
2206 2206 <p>
2207 2207 Any other string is treated as a bookmark, tag, or branch name. A
2208 2208 bookmark is a movable pointer to a revision. A tag is a permanent name
2209 2209 associated with a revision. A branch name denotes the tipmost open branch head
2210 2210 of that branch - or if they are all closed, the tipmost closed head of the
2211 2211 branch. Bookmark, tag, and branch names must not contain the &quot;:&quot; character.
2212 2212 </p>
2213 2213 <p>
2214 2214 The reserved name &quot;tip&quot; always identifies the most recent revision.
2215 2215 </p>
2216 2216 <p>
2217 2217 The reserved name &quot;null&quot; indicates the null revision. This is the
2218 2218 revision of an empty repository, and the parent of revision 0.
2219 2219 </p>
2220 2220 <p>
2221 2221 The reserved name &quot;.&quot; indicates the working directory parent. If no
2222 2222 working directory is checked out, it is equivalent to null. If an
2223 2223 uncommitted merge is in progress, &quot;.&quot; is the revision of the first
2224 2224 parent.
2225 2225 </p>
2226 2226
2227 2227 </div>
2228 2228 </div>
2229 2229 </div>
2230 2230
2231 2231 <script type="text/javascript">process_dates()</script>
2232 2232
2233 2233
2234 2234 </body>
2235 2235 </html>
2236 2236
2237 2237
2238 2238 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
2239 2239
2240 2240 #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 http://mercurial.selenic.com for more information)
73 73
74 Copyright (C) 2005-2014 Matt Mackall and others
74 Copyright (C) 2005-2015 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