upstream/mercurial-mirror Commit - r1811:6cb548cf

1

# commands.py - command processing for mercurial

1

# commands.py - command processing for mercurial

2

#

2

#

3

4

#

4

#

5

# This software may be used and distributed according to the terms

5

# This software may be used and distributed according to the terms

6

# of the GNU General Public License, incorporated herein by reference.

6

# of the GNU General Public License, incorporated herein by reference.

7

8

from demandload import demandload

8

from demandload import demandload

9

from node import *

9

from node import *

10

from i18n import gettext as _

10

from i18n import gettext as _

11

demandload(globals(), "os re sys signal shutil imp urllib pdb")

11

demandload(globals(), "os re sys signal shutil imp urllib pdb")

12

demandload(globals(), "fancyopts ui hg util lock revlog")

12

demandload(globals(), "fancyopts ui hg util lock revlog")

13

demandload(globals(), "fnmatch hgweb mdiff random signal time traceback")

13

demandload(globals(), "fnmatch hgweb mdiff random signal time traceback")

14

demandload(globals(), "errno socket version struct atexit sets bz2")

14

demandload(globals(), "errno socket version struct atexit sets bz2")

15

16

class UnknownCommand(Exception):

16

class UnknownCommand(Exception):

17

"""Exception raised if command is not in the command table."""

17

"""Exception raised if command is not in the command table."""

18

class AmbiguousCommand(Exception):

18

class AmbiguousCommand(Exception):

19

"""Exception raised if command shortcut matches more than one command."""

19

"""Exception raised if command shortcut matches more than one command."""

20

21

def filterfiles(filters, files):

21

def filterfiles(filters, files):

22

l = [x for x in files if x in filters]

22

l = [x for x in files if x in filters]

23

24

for t in filters:

24

for t in filters:

25

if t and t[-1] != "/":

25

if t and t[-1] != "/":

26

t += "/"

26

t += "/"

27

l += [x for x in files if x.startswith(t)]

27

l += [x for x in files if x.startswith(t)]

28

return l

28

return l

29

30

def relpath(repo, args):

30

def relpath(repo, args):

31

cwd = repo.getcwd()

31

cwd = repo.getcwd()

32

if cwd:

32

if cwd:

33

return [util.normpath(os.path.join(cwd, x)) for x in args]

33

return [util.normpath(os.path.join(cwd, x)) for x in args]

34

return args

34

return args

35

36

def matchpats(repo, pats=[], opts={}, head=''):

36

def matchpats(repo, pats=[], opts={}, head=''):

37

cwd = repo.getcwd()

37

cwd = repo.getcwd()

38

if not pats and cwd:

38

if not pats and cwd:

39

opts['include'] = [os.path.join(cwd, i) for i in opts['include']]

39

opts['include'] = [os.path.join(cwd, i) for i in opts['include']]

40

opts['exclude'] = [os.path.join(cwd, x) for x in opts['exclude']]

40

opts['exclude'] = [os.path.join(cwd, x) for x in opts['exclude']]

41

cwd = ''

41

cwd = ''

42

return util.cmdmatcher(repo.root, cwd, pats or ['.'], opts.get('include'),

42

return util.cmdmatcher(repo.root, cwd, pats or ['.'], opts.get('include'),

43

opts.get('exclude'), head)

43

opts.get('exclude'), head)

44

45

def makewalk(repo, pats, opts, node=None, head=''):

45

def makewalk(repo, pats, opts, node=None, head=''):

46

files, matchfn, anypats = matchpats(repo, pats, opts, head)

46

files, matchfn, anypats = matchpats(repo, pats, opts, head)

47

exact = dict(zip(files, files))

47

exact = dict(zip(files, files))

48

def walk():

48

def walk():

49

for src, fn in repo.walk(node=node, files=files, match=matchfn):

49

for src, fn in repo.walk(node=node, files=files, match=matchfn):

50

yield src, fn, util.pathto(repo.getcwd(), fn), fn in exact

50

yield src, fn, util.pathto(repo.getcwd(), fn), fn in exact

51

return files, matchfn, walk()

51

return files, matchfn, walk()

52

53

def walk(repo, pats, opts, node=None, head=''):

53

def walk(repo, pats, opts, node=None, head=''):

54

files, matchfn, results = makewalk(repo, pats, opts, node, head)

54

files, matchfn, results = makewalk(repo, pats, opts, node, head)

55

for r in results:

55

for r in results:

56

yield r

56

yield r

57

58

def walkchangerevs(ui, repo, pats, opts):

58

def walkchangerevs(ui, repo, pats, opts):

59

'''Iterate over files and the revs they changed in.

59

'''Iterate over files and the revs they changed in.

60

61

Callers most commonly need to iterate backwards over the history

61

Callers most commonly need to iterate backwards over the history

62

it is interested in. Doing so has awful (quadratic-looking)

62

it is interested in. Doing so has awful (quadratic-looking)

63

performance, so we use iterators in a "windowed" way.

63

performance, so we use iterators in a "windowed" way.

64

65

We walk a window of revisions in the desired order. Within the

65

We walk a window of revisions in the desired order. Within the

66

window, we first walk forwards to gather data, then in the desired

66

window, we first walk forwards to gather data, then in the desired

67

order (usually backwards) to display it.

67

order (usually backwards) to display it.

68

69

This function returns an (iterator, getchange, matchfn) tuple. The

69

This function returns an (iterator, getchange, matchfn) tuple. The

70

getchange function returns the changelog entry for a numeric

70

getchange function returns the changelog entry for a numeric

71

revision. The iterator yields 3-tuples. They will be of one of

71

revision. The iterator yields 3-tuples. They will be of one of

72

the following forms:

72

the following forms:

73

74

"window", incrementing, lastrev: stepping through a window,

74

"window", incrementing, lastrev: stepping through a window,

75

positive if walking forwards through revs, last rev in the

75

positive if walking forwards through revs, last rev in the

76

sequence iterated over - use to reset state for the current window

76

sequence iterated over - use to reset state for the current window

77

78

"add", rev, fns: out-of-order traversal of the given file names

78

"add", rev, fns: out-of-order traversal of the given file names

79

fns, which changed during revision rev - use to gather data for

79

fns, which changed during revision rev - use to gather data for

80

possible display

80

possible display

81

82

"iter", rev, None: in-order traversal of the revs earlier iterated

82

"iter", rev, None: in-order traversal of the revs earlier iterated

83

over with "add" - use to display data'''

83

over with "add" - use to display data'''

84

85

def increasing_windows(start, end, windowsize=8, sizelimit=512):

85

def increasing_windows(start, end, windowsize=8, sizelimit=512):

86

if start < end:

86

if start < end:

87

while start < end:

87

while start < end:

88

yield start, min(windowsize, end-start)

88

yield start, min(windowsize, end-start)

89

start += windowsize

89

start += windowsize

90

if windowsize < sizelimit:

90

if windowsize < sizelimit:

91

windowsize *= 2

91

windowsize *= 2

92

else:

92

else:

93

while start > end:

93

while start > end:

94

yield start, min(windowsize, start-end-1)

94

yield start, min(windowsize, start-end-1)

95

start -= windowsize

95

start -= windowsize

96

if windowsize < sizelimit:

96

if windowsize < sizelimit:

97

windowsize *= 2

97

windowsize *= 2

98

99

100

files, matchfn, anypats = matchpats(repo, pats, opts)

100

files, matchfn, anypats = matchpats(repo, pats, opts)

101

102

if repo.changelog.count() == 0:

102

if repo.changelog.count() == 0:

103

return [], False, matchfn

103

return [], False, matchfn

104

105

revs = map(int, revrange(ui, repo, opts['rev'] or ['tip:0']))

105

revs = map(int, revrange(ui, repo, opts['rev'] or ['tip:0']))

106

wanted = {}

106

wanted = {}

107

slowpath = anypats

107

slowpath = anypats

108

fncache = {}

108

fncache = {}

109

110

chcache = {}

110

chcache = {}

111

def getchange(rev):

111

def getchange(rev):

112

ch = chcache.get(rev)

112

ch = chcache.get(rev)

113

if ch is None:

113

if ch is None:

114

chcache[rev] = ch = repo.changelog.read(repo.lookup(str(rev)))

114

chcache[rev] = ch = repo.changelog.read(repo.lookup(str(rev)))

115

return ch

115

return ch

116

117

if not slowpath and not files:

117

if not slowpath and not files:

118

# No files, no patterns. Display all revs.

118

# No files, no patterns. Display all revs.

119

wanted = dict(zip(revs, revs))

119

wanted = dict(zip(revs, revs))

120

if not slowpath:

120

if not slowpath:

121

# Only files, no patterns. Check the history of each file.

121

# Only files, no patterns. Check the history of each file.

122

def filerevgen(filelog):

122

def filerevgen(filelog):

123

for i, window in increasing_windows(filelog.count()-1, -1):

123

for i, window in increasing_windows(filelog.count()-1, -1):

124

revs = []

124

revs = []

125

for j in xrange(i - window, i + 1):

125

for j in xrange(i - window, i + 1):

126

revs.append(filelog.linkrev(filelog.node(j)))

126

revs.append(filelog.linkrev(filelog.node(j)))

127

revs.reverse()

127

revs.reverse()

128

for rev in revs:

128

for rev in revs:

129

yield rev

129

yield rev

130

131

minrev, maxrev = min(revs), max(revs)

131

minrev, maxrev = min(revs), max(revs)

132

for file_ in files:

132

for file_ in files:

133

filelog = repo.file(file_)

133

filelog = repo.file(file_)

134

# A zero count may be a directory or deleted file, so

134

# A zero count may be a directory or deleted file, so

135

# try to find matching entries on the slow path.

135

# try to find matching entries on the slow path.

136

if filelog.count() == 0:

136

if filelog.count() == 0:

137

slowpath = True

137

slowpath = True

138

break

138

break

139

for rev in filerevgen(filelog):

139

for rev in filerevgen(filelog):

140

if rev <= maxrev:

140

if rev <= maxrev:

141

if rev < minrev:

141

if rev < minrev:

142

break

142

break

143

fncache.setdefault(rev, [])

143

fncache.setdefault(rev, [])

144

fncache[rev].append(file_)

144

fncache[rev].append(file_)

145

wanted[rev] = 1

145

wanted[rev] = 1

146

if slowpath:

146

if slowpath:

147

# The slow path checks files modified in every changeset.

147

# The slow path checks files modified in every changeset.

148

def changerevgen():

148

def changerevgen():

149

for i, window in increasing_windows(repo.changelog.count()-1, -1):

149

for i, window in increasing_windows(repo.changelog.count()-1, -1):

150

for j in xrange(i - window, i + 1):

150

for j in xrange(i - window, i + 1):

151

yield j, getchange(j)[3]

151

yield j, getchange(j)[3]

152

153

for rev, changefiles in changerevgen():

153

for rev, changefiles in changerevgen():

154

matches = filter(matchfn, changefiles)

154

matches = filter(matchfn, changefiles)

155

if matches:

155

if matches:

156

fncache[rev] = matches

156

fncache[rev] = matches

157

wanted[rev] = 1

157

wanted[rev] = 1

158

159

def iterate():

159

def iterate():

160

for i, window in increasing_windows(0, len(revs)):

160

for i, window in increasing_windows(0, len(revs)):

161

yield 'window', revs[0] < revs[-1], revs[-1]

161

yield 'window', revs[0] < revs[-1], revs[-1]

162

nrevs = [rev for rev in revs[i:i+window]

162

nrevs = [rev for rev in revs[i:i+window]

163

if rev in wanted]

163

if rev in wanted]

164

srevs = list(nrevs)

164

srevs = list(nrevs)

165

srevs.sort()

165

srevs.sort()

166

for rev in srevs:

166

for rev in srevs:

167

fns = fncache.get(rev) or filter(matchfn, getchange(rev)[3])

167

fns = fncache.get(rev) or filter(matchfn, getchange(rev)[3])

168

yield 'add', rev, fns

168

yield 'add', rev, fns

169

for rev in nrevs:

169

for rev in nrevs:

170

yield 'iter', rev, None

170

yield 'iter', rev, None

171

return iterate(), getchange, matchfn

171

return iterate(), getchange, matchfn

172

173

revrangesep = ':'

173

revrangesep = ':'

174

175

def revrange(ui, repo, revs, revlog=None):

175

def revrange(ui, repo, revs, revlog=None):

176

"""Yield revision as strings from a list of revision specifications."""

176

"""Yield revision as strings from a list of revision specifications."""

177

if revlog is None:

177

if revlog is None:

178

revlog = repo.changelog

178

revlog = repo.changelog

179

revcount = revlog.count()

179

revcount = revlog.count()

180

def fix(val, defval):

180

def fix(val, defval):

181

if not val:

181

if not val:

182

return defval

182

return defval

183

try:

183

try:

184

num = int(val)

184

num = int(val)

185

if str(num) != val:

185

if str(num) != val:

186

raise ValueError

186

raise ValueError

187

if num < 0:

187

if num < 0:

188

num += revcount

188

num += revcount

189

if num < 0:

189

if num < 0:

190

num = 0

190

num = 0

191

elif num >= revcount:

191

elif num >= revcount:

192

raise ValueError

192

raise ValueError

193

except ValueError:

193

except ValueError:

194

try:

194

try:

195

num = repo.changelog.rev(repo.lookup(val))

195

num = repo.changelog.rev(repo.lookup(val))

196

except KeyError:

196

except KeyError:

197

try:

197

try:

198

num = revlog.rev(revlog.lookup(val))

198

num = revlog.rev(revlog.lookup(val))

199

except KeyError:

199

except KeyError:

200

raise util.Abort(_('invalid revision identifier %s'), val)

200

raise util.Abort(_('invalid revision identifier %s'), val)

201

return num

201

return num

202

seen = {}

202

seen = {}

203

for spec in revs:

203

for spec in revs:

204

if spec.find(revrangesep) >= 0:

204

if spec.find(revrangesep) >= 0:

205

start, end = spec.split(revrangesep, 1)

205

start, end = spec.split(revrangesep, 1)

206

start = fix(start, 0)

206

start = fix(start, 0)

207

end = fix(end, revcount - 1)

207

end = fix(end, revcount - 1)

208

step = start > end and -1 or 1

208

step = start > end and -1 or 1

209

for rev in xrange(start, end+step, step):

209

for rev in xrange(start, end+step, step):

210

if rev in seen:

210

if rev in seen:

211

continue

211

continue

212

seen[rev] = 1

212

seen[rev] = 1

213

yield str(rev)

213

yield str(rev)

214

else:

214

else:

215

rev = fix(spec, None)

215

rev = fix(spec, None)

216

if rev in seen:

216

if rev in seen:

217

continue

217

continue

218

seen[rev] = 1

218

seen[rev] = 1

219

yield str(rev)

219

yield str(rev)

220

221

def make_filename(repo, r, pat, node=None,

221

def make_filename(repo, r, pat, node=None,

222

total=None, seqno=None, revwidth=None, pathname=None):

222

total=None, seqno=None, revwidth=None, pathname=None):

223

node_expander = {

223

node_expander = {

224

'H': lambda: hex(node),

224

'H': lambda: hex(node),

225

'R': lambda: str(r.rev(node)),

225

'R': lambda: str(r.rev(node)),

226

'h': lambda: short(node),

226

'h': lambda: short(node),

227

}

227

}

228

expander = {

228

expander = {

229

'%': lambda: '%',

229

'%': lambda: '%',

230

'b': lambda: os.path.basename(repo.root),

230

'b': lambda: os.path.basename(repo.root),

231

}

231

}

232

233

try:

233

try:

234

if node:

234

if node:

235

expander.update(node_expander)

235

expander.update(node_expander)

236

if node and revwidth is not None:

236

if node and revwidth is not None:

237

expander['r'] = lambda: str(r.rev(node)).zfill(revwidth)

237

expander['r'] = lambda: str(r.rev(node)).zfill(revwidth)

238

if total is not None:

238

if total is not None:

239

expander['N'] = lambda: str(total)

239

expander['N'] = lambda: str(total)

240

if seqno is not None:

240

if seqno is not None:

241

expander['n'] = lambda: str(seqno)

241

expander['n'] = lambda: str(seqno)

242

if total is not None and seqno is not None:

242

if total is not None and seqno is not None:

243

expander['n'] = lambda:str(seqno).zfill(len(str(total)))

243

expander['n'] = lambda:str(seqno).zfill(len(str(total)))

244

if pathname is not None:

244

if pathname is not None:

245

expander['s'] = lambda: os.path.basename(pathname)

245

expander['s'] = lambda: os.path.basename(pathname)

246

expander['d'] = lambda: os.path.dirname(pathname) or '.'

246

expander['d'] = lambda: os.path.dirname(pathname) or '.'

247

expander['p'] = lambda: pathname

247

expander['p'] = lambda: pathname

248

249

newname = []

249

newname = []

250

patlen = len(pat)

250

patlen = len(pat)

251

i = 0

251

i = 0

252

while i < patlen:

252

while i < patlen:

253

c = pat[i]

253

c = pat[i]

254

if c == '%':

254

if c == '%':

255

i += 1

255

i += 1

256

c = pat[i]

256

c = pat[i]

257

c = expander[c]()

257

c = expander[c]()

258

newname.append(c)

258

newname.append(c)

259

i += 1

259

i += 1

260

return ''.join(newname)

260

return ''.join(newname)

261

except KeyError, inst:

261

except KeyError, inst:

262

raise util.Abort(_("invalid format spec '%%%s' in output file name"),

262

raise util.Abort(_("invalid format spec '%%%s' in output file name"),

263

inst.args[0])

263

inst.args[0])

264

265

def make_file(repo, r, pat, node=None,

265

def make_file(repo, r, pat, node=None,

266

total=None, seqno=None, revwidth=None, mode='wb', pathname=None):

266

total=None, seqno=None, revwidth=None, mode='wb', pathname=None):

267

if not pat or pat == '-':

267

if not pat or pat == '-':

268

return 'w' in mode and sys.stdout or sys.stdin

268

return 'w' in mode and sys.stdout or sys.stdin

269

if hasattr(pat, 'write') and 'w' in mode:

269

if hasattr(pat, 'write') and 'w' in mode:

270

return pat

270

return pat

271

if hasattr(pat, 'read') and 'r' in mode:

271

if hasattr(pat, 'read') and 'r' in mode:

272

return pat

272

return pat

273

return open(make_filename(repo, r, pat, node, total, seqno, revwidth,

273

return open(make_filename(repo, r, pat, node, total, seqno, revwidth,

274

pathname),

274

pathname),

275

mode)

275

mode)

276

277

def dodiff(fp, ui, repo, node1, node2, files=None, match=util.always,

277

def dodiff(fp, ui, repo, node1, node2, files=None, match=util.always,

278

changes=None, text=False, opts={}):

278

changes=None, text=False, opts={}):

279

if not node1:

279

if not node1:

280

node1 = repo.dirstate.parents()[0]

280

node1 = repo.dirstate.parents()[0]

281

# reading the data for node1 early allows it to play nicely

281

# reading the data for node1 early allows it to play nicely

282

# with repo.changes and the revlog cache.

282

# with repo.changes and the revlog cache.

283

change = repo.changelog.read(node1)

283

change = repo.changelog.read(node1)

284

mmap = repo.manifest.read(change[0])

284

mmap = repo.manifest.read(change[0])

285

date1 = util.datestr(change[2])

285

date1 = util.datestr(change[2])

286

287

if not changes:

287

if not changes:

288

changes = repo.changes(node1, node2, files, match=match)

288

changes = repo.changes(node1, node2, files, match=match)

289

modified, added, removed, deleted, unknown = changes

289

modified, added, removed, deleted, unknown = changes

290

if files:

290

if files:

291

modified, added, removed = map(lambda x: filterfiles(files, x),

291

modified, added, removed = map(lambda x: filterfiles(files, x),

292

(modified, added, removed))

292

(modified, added, removed))

293

294

if not modified and not added and not removed:

294

if not modified and not added and not removed:

295

return

295

return

296

297

if node2:

297

if node2:

298

change = repo.changelog.read(node2)

298

change = repo.changelog.read(node2)

299

mmap2 = repo.manifest.read(change[0])

299

mmap2 = repo.manifest.read(change[0])

300

date2 = util.datestr(change[2])

300

date2 = util.datestr(change[2])

301

def read(f):

301

def read(f):

302

return repo.file(f).read(mmap2[f])

302

return repo.file(f).read(mmap2[f])

303

else:

303

else:

304

date2 = util.datestr()

304

date2 = util.datestr()

305

def read(f):

305

def read(f):

306

return repo.wread(f)

306

return repo.wread(f)

307

308

if ui.quiet:

308

if ui.quiet:

309

r = None

309

r = None

310

else:

310

else:

311

hexfunc = ui.verbose and hex or short

311

hexfunc = ui.verbose and hex or short

312

r = [hexfunc(node) for node in [node1, node2] if node]

312

r = [hexfunc(node) for node in [node1, node2] if node]

313

314

diffopts = ui.diffopts()

314

diffopts = ui.diffopts()

315

showfunc = opts.get('show_function') or diffopts['showfunc']

315

showfunc = opts.get('show_function') or diffopts['showfunc']

316

ignorews = opts.get('ignore_all_space') or diffopts['ignorews']

316

ignorews = opts.get('ignore_all_space') or diffopts['ignorews']

317

for f in modified:

317

for f in modified:

318

to = None

318

to = None

319

if f in mmap:

319

if f in mmap:

320

to = repo.file(f).read(mmap[f])

320

to = repo.file(f).read(mmap[f])

321

tn = read(f)

321

tn = read(f)

322

fp.write(mdiff.unidiff(to, date1, tn, date2, f, r, text=text,

322

fp.write(mdiff.unidiff(to, date1, tn, date2, f, r, text=text,

323

showfunc=showfunc, ignorews=ignorews))

323

showfunc=showfunc, ignorews=ignorews))

324

for f in added:

324

for f in added:

325

to = None

325

to = None

326

tn = read(f)

326

tn = read(f)

327

fp.write(mdiff.unidiff(to, date1, tn, date2, f, r, text=text,

327

fp.write(mdiff.unidiff(to, date1, tn, date2, f, r, text=text,

328

showfunc=showfunc, ignorews=ignorews))

328

showfunc=showfunc, ignorews=ignorews))

329

for f in removed:

329

for f in removed:

330

to = repo.file(f).read(mmap[f])

330

to = repo.file(f).read(mmap[f])

331

tn = None

331

tn = None

332

fp.write(mdiff.unidiff(to, date1, tn, date2, f, r, text=text,

332

fp.write(mdiff.unidiff(to, date1, tn, date2, f, r, text=text,

333

showfunc=showfunc, ignorews=ignorews))

333

showfunc=showfunc, ignorews=ignorews))

334

335

def trimuser(ui, name, rev, revcache):

335

def trimuser(ui, name, rev, revcache):

336

"""trim the name of the user who committed a change"""

336

"""trim the name of the user who committed a change"""

337

user = revcache.get(rev)

337

user = revcache.get(rev)

338

if user is None:

338

if user is None:

339

user = revcache[rev] = ui.shortuser(name)

339

user = revcache[rev] = ui.shortuser(name)

340

return user

340

return user

341

342

def show_changeset(ui, repo, rev=0, changenode=None, brinfo=None):

342

def show_changeset(ui, repo, rev=0, changenode=None, brinfo=None):

343

"""show a single changeset or file revision"""

343

"""show a single changeset or file revision"""

344

log = repo.changelog

344

log = repo.changelog

345

if changenode is None:

345

if changenode is None:

346

changenode = log.node(rev)

346

changenode = log.node(rev)

347

elif not rev:

347

elif not rev:

348

rev = log.rev(changenode)

348

rev = log.rev(changenode)

349

350

if ui.quiet:

350

if ui.quiet:

351

ui.write("%d:%s\n" % (rev, short(changenode)))

351

ui.write("%d:%s\n" % (rev, short(changenode)))

352

return

352

return

353

354

changes = log.read(changenode)

354

changes = log.read(changenode)

355

date = util.datestr(changes[2])

355

date = util.datestr(changes[2])

356

357

parents = [(log.rev(p), ui.verbose and hex(p) or short(p))

357

parents = [(log.rev(p), ui.verbose and hex(p) or short(p))

358

for p in log.parents(changenode)

358

for p in log.parents(changenode)

359

if ui.debugflag or p != nullid]

359

if ui.debugflag or p != nullid]

360

if not ui.debugflag and len(parents) == 1 and parents[0][0] == rev-1:

360

if not ui.debugflag and len(parents) == 1 and parents[0][0] == rev-1:

361

parents = []

361

parents = []

362

363

if ui.verbose:

363

if ui.verbose:

364

ui.write(_("changeset: %d:%s\n") % (rev, hex(changenode)))

364

ui.write(_("changeset: %d:%s\n") % (rev, hex(changenode)))

365

else:

365

else:

366

ui.write(_("changeset: %d:%s\n") % (rev, short(changenode)))

366

ui.write(_("changeset: %d:%s\n") % (rev, short(changenode)))

367

368

for tag in repo.nodetags(changenode):

368

for tag in repo.nodetags(changenode):

369

ui.status(_("tag: %s\n") % tag)

369

ui.status(_("tag: %s\n") % tag)

370

for parent in parents:

370

for parent in parents:

371

ui.write(_("parent: %d:%s\n") % parent)

371

ui.write(_("parent: %d:%s\n") % parent)

372

373

if brinfo and changenode in brinfo:

373

if brinfo and changenode in brinfo:

374

br = brinfo[changenode]

374

br = brinfo[changenode]

375

ui.write(_("branch: %s\n") % " ".join(br))

375

ui.write(_("branch: %s\n") % " ".join(br))

376

377

ui.debug(_("manifest: %d:%s\n") % (repo.manifest.rev(changes[0]),

377

ui.debug(_("manifest: %d:%s\n") % (repo.manifest.rev(changes[0]),

378

hex(changes[0])))

378

hex(changes[0])))

379

ui.status(_("user: %s\n") % changes[1])

379

ui.status(_("user: %s\n") % changes[1])

380

ui.status(_("date: %s\n") % date)

380

ui.status(_("date: %s\n") % date)

381

382

if ui.debugflag:

382

if ui.debugflag:

383

files = repo.changes(log.parents(changenode)[0], changenode)

383

files = repo.changes(log.parents(changenode)[0], changenode)

384

for key, value in zip([_("files:"), _("files+:"), _("files-:")], files):

384

for key, value in zip([_("files:"), _("files+:"), _("files-:")], files):

385

if value:

385

if value:

386

ui.note("%-12s %s\n" % (key, " ".join(value)))

386

ui.note("%-12s %s\n" % (key, " ".join(value)))

387

else:

387

else:

388

ui.note(_("files: %s\n") % " ".join(changes[3]))

388

ui.note(_("files: %s\n") % " ".join(changes[3]))

389

390

description = changes[4].strip()

390

description = changes[4].strip()

391

if description:

391

if description:

392

if ui.verbose:

392

if ui.verbose:

393

ui.status(_("description:\n"))

393

ui.status(_("description:\n"))

394

ui.status(description)

394

ui.status(description)

395

ui.status("\n\n")

395

ui.status("\n\n")

396

else:

396

else:

397

ui.status(_("summary: %s\n") % description.splitlines()[0])

397

ui.status(_("summary: %s\n") % description.splitlines()[0])

398

ui.status("\n")

398

ui.status("\n")

399

400

def show_version(ui):

400

def show_version(ui):

401

"""output version and copyright information"""

401

"""output version and copyright information"""

402

ui.write(_("Mercurial Distributed SCM (version %s)\n")

402

ui.write(_("Mercurial Distributed SCM (version %s)\n")

403

% version.get_version())

403

% version.get_version())

404

ui.status(_(

404

ui.status(_(

405

406

"This is free software; see the source for copying conditions. "

406

"This is free software; see the source for copying conditions. "

407

"There is NO\nwarranty; "

407

"There is NO\nwarranty; "

408

"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"

408

"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"

409

))

409

))

410

411

def help_(ui, cmd=None, with_version=False):

411

def help_(ui, cmd=None, with_version=False):

412

"""show help for a given command or all commands"""

412

"""show help for a given command or all commands"""

413

option_lists = []

413

option_lists = []

414

if cmd and cmd != 'shortlist':

414

if cmd and cmd != 'shortlist':

415

if with_version:

415

if with_version:

416

show_version(ui)

416

show_version(ui)

417

ui.write('\n')

417

ui.write('\n')

418

aliases, i = find(cmd)

418

aliases, i = find(cmd)

419

# synopsis

419

# synopsis

420

ui.write("%s\n\n" % i[2])

420

ui.write("%s\n\n" % i[2])

421

422

# description

422

# description

423

doc = i[0].__doc__

423

doc = i[0].__doc__

424

if not doc:

424

if not doc:

425

doc = _("(No help text available)")

425

doc = _("(No help text available)")

426

if ui.quiet:

426

if ui.quiet:

427

doc = doc.splitlines(0)[0]

427

doc = doc.splitlines(0)[0]

428

ui.write("%s\n" % doc.rstrip())

428

ui.write("%s\n" % doc.rstrip())

429

430

if not ui.quiet:

430

if not ui.quiet:

431

# aliases

431

# aliases

432

if len(aliases) > 1:

432

if len(aliases) > 1:

433

ui.write(_("\naliases: %s\n") % ', '.join(aliases[1:]))

433

ui.write(_("\naliases: %s\n") % ', '.join(aliases[1:]))

434

435

# options

435

# options

436

if i[1]:

436

if i[1]:

437

option_lists.append(("options", i[1]))

437

option_lists.append(("options", i[1]))

438

439

else:

439

else:

440

# program name

440

# program name

441

if ui.verbose or with_version:

441

if ui.verbose or with_version:

442

show_version(ui)

442

show_version(ui)

443

else:

443

else:

444

ui.status(_("Mercurial Distributed SCM\n"))

444

ui.status(_("Mercurial Distributed SCM\n"))

445

ui.status('\n')

445

ui.status('\n')

446

447

# list of commands

447

# list of commands

448

if cmd == "shortlist":

448

if cmd == "shortlist":

449

ui.status(_('basic commands (use "hg help" '

449

ui.status(_('basic commands (use "hg help" '

450

'for the full list or option "-v" for details):\n\n'))

450

'for the full list or option "-v" for details):\n\n'))

451

elif ui.verbose:

451

elif ui.verbose:

452

ui.status(_('list of commands:\n\n'))

452

ui.status(_('list of commands:\n\n'))

453

else:

453

else:

454

ui.status(_('list of commands (use "hg help -v" '

454

ui.status(_('list of commands (use "hg help -v" '

455

'to show aliases and global options):\n\n'))

455

'to show aliases and global options):\n\n'))

456

457

h = {}

457

h = {}

458

cmds = {}

458

cmds = {}

459

for c, e in table.items():

459

for c, e in table.items():

460

f = c.split("|")[0]

460

f = c.split("|")[0]

461

if cmd == "shortlist" and not f.startswith("^"):

461

if cmd == "shortlist" and not f.startswith("^"):

462

continue

462

continue

463

f = f.lstrip("^")

463

f = f.lstrip("^")

464

if not ui.debugflag and f.startswith("debug"):

464

if not ui.debugflag and f.startswith("debug"):

465

continue

465

continue

466

doc = e[0].__doc__

466

doc = e[0].__doc__

467

if not doc:

467

if not doc:

468

doc = _("(No help text available)")

468

doc = _("(No help text available)")

469

h[f] = doc.splitlines(0)[0].rstrip()

469

h[f] = doc.splitlines(0)[0].rstrip()

470

cmds[f] = c.lstrip("^")

470

cmds[f] = c.lstrip("^")

471

472

fns = h.keys()

472

fns = h.keys()

473

fns.sort()

473

fns.sort()

474

m = max(map(len, fns))

474

m = max(map(len, fns))

475

for f in fns:

475

for f in fns:

476

if ui.verbose:

476

if ui.verbose:

477

commands = cmds[f].replace("|",", ")

477

commands = cmds[f].replace("|",", ")

478

ui.write(" %s:\n %s\n"%(commands, h[f]))

478

ui.write(" %s:\n %s\n"%(commands, h[f]))

479

else:

479

else:

480

ui.write(' %-*s %s\n' % (m, f, h[f]))

480

ui.write(' %-*s %s\n' % (m, f, h[f]))

481

482

# global options

482

# global options

483

if ui.verbose:

483

if ui.verbose:

484

option_lists.append(("global options", globalopts))

484

option_lists.append(("global options", globalopts))

485

486

# list all option lists

486

# list all option lists

487

opt_output = []

487

opt_output = []

488

for title, options in option_lists:

488

for title, options in option_lists:

489

opt_output.append(("\n%s:\n" % title, None))

489

opt_output.append(("\n%s:\n" % title, None))

490

for shortopt, longopt, default, desc in options:

490

for shortopt, longopt, default, desc in options:

491

opt_output.append(("%2s%s" % (shortopt and "-%s" % shortopt,

491

opt_output.append(("%2s%s" % (shortopt and "-%s" % shortopt,

492

longopt and " --%s" % longopt),

492

longopt and " --%s" % longopt),

493

"%s%s" % (desc,

493

"%s%s" % (desc,

494

default

494

default

495

and _(" (default: %s)") % default

495

and _(" (default: %s)") % default

496

or "")))

496

or "")))

497

498

if opt_output:

498

if opt_output:

499

opts_len = max([len(line[0]) for line in opt_output if line[1]])

499

opts_len = max([len(line[0]) for line in opt_output if line[1]])

500

for first, second in opt_output:

500

for first, second in opt_output:

501

if second:

501

if second:

502

ui.write(" %-*s %s\n" % (opts_len, first, second))

502

ui.write(" %-*s %s\n" % (opts_len, first, second))

503

else:

503

else:

504

ui.write("%s\n" % first)

504

ui.write("%s\n" % first)

505

506

# Commands start here, listed alphabetically

506

# Commands start here, listed alphabetically

507

508

def add(ui, repo, *pats, **opts):

508

def add(ui, repo, *pats, **opts):

509

"""add the specified files on the next commit

509

"""add the specified files on the next commit

510

511

Schedule files to be version controlled and added to the repository.

511

Schedule files to be version controlled and added to the repository.

512

513

The files will be added to the repository at the next commit.

513

The files will be added to the repository at the next commit.

514

515

If no names are given, add all files in the repository.

515

If no names are given, add all files in the repository.

516

"""

516

"""

517

518

names = []

518

names = []

519

for src, abs, rel, exact in walk(repo, pats, opts):

519

for src, abs, rel, exact in walk(repo, pats, opts):

520

if exact:

520

if exact:

521

if ui.verbose:

521

if ui.verbose:

522

ui.status(_('adding %s\n') % rel)

522

ui.status(_('adding %s\n') % rel)

523

names.append(abs)

523

names.append(abs)

524

elif repo.dirstate.state(abs) == '?':

524

elif repo.dirstate.state(abs) == '?':

525

ui.status(_('adding %s\n') % rel)

525

ui.status(_('adding %s\n') % rel)

526

names.append(abs)

526

names.append(abs)

527

repo.add(names)

527

repo.add(names)

528

529

def addremove(ui, repo, *pats, **opts):

529

def addremove(ui, repo, *pats, **opts):

530

"""add all new files, delete all missing files

530

"""add all new files, delete all missing files

531

532

Add all new files and remove all missing files from the repository.

532

Add all new files and remove all missing files from the repository.

533

534

New files are ignored if they match any of the patterns in .hgignore. As

534

New files are ignored if they match any of the patterns in .hgignore. As

535

with add, these changes take effect at the next commit.

535

with add, these changes take effect at the next commit.

536

"""

536

"""

537

return addremove_lock(ui, repo, pats, opts)

537

return addremove_lock(ui, repo, pats, opts)

538

539

def addremove_lock(ui, repo, pats, opts, wlock=None):

539

def addremove_lock(ui, repo, pats, opts, wlock=None):

540

add, remove = [], []

540

add, remove = [], []

541

for src, abs, rel, exact in walk(repo, pats, opts):

541

for src, abs, rel, exact in walk(repo, pats, opts):

542

if src == 'f' and repo.dirstate.state(abs) == '?':

542

if src == 'f' and repo.dirstate.state(abs) == '?':

543

add.append(abs)

543

add.append(abs)

544

if ui.verbose or not exact:

544

if ui.verbose or not exact:

545

ui.status(_('adding %s\n') % ((pats and rel) or abs))

545

ui.status(_('adding %s\n') % ((pats and rel) or abs))

546

if repo.dirstate.state(abs) != 'r' and not os.path.exists(rel):

546

if repo.dirstate.state(abs) != 'r' and not os.path.exists(rel):

547

remove.append(abs)

547

remove.append(abs)

548

if ui.verbose or not exact:

548

if ui.verbose or not exact:

549

ui.status(_('removing %s\n') % ((pats and rel) or abs))

549

ui.status(_('removing %s\n') % ((pats and rel) or abs))

550

repo.add(add, wlock=wlock)

550

repo.add(add, wlock=wlock)

551

repo.remove(remove, wlock=wlock)

551

repo.remove(remove, wlock=wlock)

552

553

def annotate(ui, repo, *pats, **opts):

553

def annotate(ui, repo, *pats, **opts):

554

"""show changeset information per file line

554

"""show changeset information per file line

555

556

List changes in files, showing the revision id responsible for each line

556

List changes in files, showing the revision id responsible for each line

557

558

This command is useful to discover who did a change or when a change took

558

This command is useful to discover who did a change or when a change took

559

place.

559

place.

560

561

Without the -a option, annotate will avoid processing files it

561

Without the -a option, annotate will avoid processing files it

562

detects as binary. With -a, annotate will generate an annotation

562

detects as binary. With -a, annotate will generate an annotation

563

anyway, probably with undesirable results.

563

anyway, probably with undesirable results.

564

"""

564

"""

565

def getnode(rev):

565

def getnode(rev):

566

return short(repo.changelog.node(rev))

566

return short(repo.changelog.node(rev))

567

568

ucache = {}

568

ucache = {}

569

def getname(rev):

569

def getname(rev):

570

cl = repo.changelog.read(repo.changelog.node(rev))

570

cl = repo.changelog.read(repo.changelog.node(rev))

571

return trimuser(ui, cl[1], rev, ucache)

571

return trimuser(ui, cl[1], rev, ucache)

572

573

dcache = {}

573

dcache = {}

574

def getdate(rev):

574

def getdate(rev):

575

datestr = dcache.get(rev)

575

datestr = dcache.get(rev)

576

if datestr is None:

576

if datestr is None:

577

cl = repo.changelog.read(repo.changelog.node(rev))

577

cl = repo.changelog.read(repo.changelog.node(rev))

578

datestr = dcache[rev] = util.datestr(cl[2])

578

datestr = dcache[rev] = util.datestr(cl[2])

579

return datestr

579

return datestr

580

581

if not pats:

581

if not pats:

582

raise util.Abort(_('at least one file name or pattern required'))

582

raise util.Abort(_('at least one file name or pattern required'))

583

584

opmap = [['user', getname], ['number', str], ['changeset', getnode],

584

opmap = [['user', getname], ['number', str], ['changeset', getnode],

585

['date', getdate]]

585

['date', getdate]]

586

if not opts['user'] and not opts['changeset'] and not opts['date']:

586

if not opts['user'] and not opts['changeset'] and not opts['date']:

587

opts['number'] = 1

587

opts['number'] = 1

588

589

if opts['rev']:

589

if opts['rev']:

590

node = repo.changelog.lookup(opts['rev'])

590

node = repo.changelog.lookup(opts['rev'])

591

else:

591

else:

592

node = repo.dirstate.parents()[0]

592

node = repo.dirstate.parents()[0]

593

change = repo.changelog.read(node)

593

change = repo.changelog.read(node)

594

mmap = repo.manifest.read(change[0])

594

mmap = repo.manifest.read(change[0])

595

596

for src, abs, rel, exact in walk(repo, pats, opts):

596

for src, abs, rel, exact in walk(repo, pats, opts):

597

if abs not in mmap:

597

if abs not in mmap:

598

ui.warn(_("warning: %s is not in the repository!\n") %

598

ui.warn(_("warning: %s is not in the repository!\n") %

599

((pats and rel) or abs))

599

((pats and rel) or abs))

600

continue

600

continue

601

602

f = repo.file(abs)

602

f = repo.file(abs)

603

if not opts['text'] and util.binary(f.read(mmap[abs])):

603

if not opts['text'] and util.binary(f.read(mmap[abs])):

604

ui.write(_("%s: binary file\n") % ((pats and rel) or abs))

604

ui.write(_("%s: binary file\n") % ((pats and rel) or abs))

605

continue

605

continue

606

607

lines = f.annotate(mmap[abs])

607

lines = f.annotate(mmap[abs])

608

pieces = []

608

pieces = []

609

610

for o, f in opmap:

610

for o, f in opmap:

611

if opts[o]:

611

if opts[o]:

612

l = [f(n) for n, dummy in lines]

612

l = [f(n) for n, dummy in lines]

613

if l:

613

if l:

614

m = max(map(len, l))

614

m = max(map(len, l))

615

pieces.append(["%*s" % (m, x) for x in l])

615

pieces.append(["%*s" % (m, x) for x in l])

616

617

if pieces:

617

if pieces:

618

for p, l in zip(zip(*pieces), lines):

618

for p, l in zip(zip(*pieces), lines):

619

ui.write("%s: %s" % (" ".join(p), l[1]))

619

ui.write("%s: %s" % (" ".join(p), l[1]))

620

621

def bundle(ui, repo, fname, dest="default-push", **opts):

621

def bundle(ui, repo, fname, dest="default-push", **opts):

622

"""create a changegroup file

622

"""create a changegroup file

623

624

Generate a compressed changegroup file collecting all changesets

624

Generate a compressed changegroup file collecting all changesets

625

not found in the other repository.

625

not found in the other repository.

626

627

This file can then be transferred using conventional means and

627

This file can then be transferred using conventional means and

628

applied to another repository with the unbundle command. This is

628

applied to another repository with the unbundle command. This is

629

useful when native push and pull are not available or when

629

useful when native push and pull are not available or when

630

exporting an entire repository is undesirable. The standard file

630

exporting an entire repository is undesirable. The standard file

631

extension is ".hg".

631

extension is ".hg".

632

633

Unlike import/export, this exactly preserves all changeset

633

Unlike import/export, this exactly preserves all changeset

634

contents including permissions, rename data, and revision history.

634

contents including permissions, rename data, and revision history.

635

"""

635

"""

636

f = open(fname, "wb")

636

f = open(fname, "wb")

637

dest = ui.expandpath(dest, repo.root)

637

dest = ui.expandpath(dest, repo.root)

638

other = hg.repository(ui, dest)

638

other = hg.repository(ui, dest)

639

o = repo.findoutgoing(other)

639

o = repo.findoutgoing(other)

640

cg = repo.changegroup(o, 'bundle')

640

cg = repo.changegroup(o, 'bundle')

641

642

try:

642

try:

643

f.write("HG10")

643

f.write("HG10")

644

z = bz2.BZ2Compressor(9)

644

z = bz2.BZ2Compressor(9)

645

while 1:

645

while 1:

646

chunk = cg.read(4096)

646

chunk = cg.read(4096)

647

if not chunk:

647

if not chunk:

648

break

648

break

649

f.write(z.compress(chunk))

649

f.write(z.compress(chunk))

650

f.write(z.flush())

650

f.write(z.flush())

651

except:

651

except:

652

os.unlink(fname)

652

os.unlink(fname)

653

raise

653

raise

654

655

def cat(ui, repo, file1, *pats, **opts):

655

def cat(ui, repo, file1, *pats, **opts):

656

"""output the latest or given revisions of files

656

"""output the latest or given revisions of files

657

658

Print the specified files as they were at the given revision.

658

Print the specified files as they were at the given revision.

659

If no revision is given then the tip is used.

659

If no revision is given then the tip is used.

660

661

Output may be to a file, in which case the name of the file is

661

Output may be to a file, in which case the name of the file is

662

given using a format string. The formatting rules are the same as

662

given using a format string. The formatting rules are the same as

663

for the export command, with the following additions:

663

for the export command, with the following additions:

664

665

%s basename of file being printed

665

%s basename of file being printed

666

%d dirname of file being printed, or '.' if in repo root

666

%d dirname of file being printed, or '.' if in repo root

667

%p root-relative path name of file being printed

667

%p root-relative path name of file being printed

668

"""

668

"""

669

mf = {}

669

mf = {}

670

rev = opts['rev']

670

rev = opts['rev']

671

if rev:

671

if rev:

672

node = repo.lookup(rev)

672

node = repo.lookup(rev)

673

else:

673

else:

674

node = repo.changelog.tip()

674

node = repo.changelog.tip()

675

change = repo.changelog.read(node)

675

change = repo.changelog.read(node)

676

mf = repo.manifest.read(change[0])

676

mf = repo.manifest.read(change[0])

677

for src, abs, rel, exact in walk(repo, (file1,) + pats, opts, node):

677

for src, abs, rel, exact in walk(repo, (file1,) + pats, opts, node):

678

r = repo.file(abs)

678

r = repo.file(abs)

679

n = mf[abs]

679

n = mf[abs]

680

fp = make_file(repo, r, opts['output'], node=n, pathname=abs)

680

fp = make_file(repo, r, opts['output'], node=n, pathname=abs)

681

fp.write(r.read(n))

681

fp.write(r.read(n))

682

683

def clone(ui, source, dest=None, **opts):

683

def clone(ui, source, dest=None, **opts):

684

"""make a copy of an existing repository

684

"""make a copy of an existing repository

685

686

Create a copy of an existing repository in a new directory.

686

Create a copy of an existing repository in a new directory.

687

688

If no destination directory name is specified, it defaults to the

688

If no destination directory name is specified, it defaults to the

689

basename of the source.

689

basename of the source.

690

691

The location of the source is added to the new repository's

691

The location of the source is added to the new repository's

692

.hg/hgrc file, as the default to be used for future pulls.

692

.hg/hgrc file, as the default to be used for future pulls.

693

694

For efficiency, hardlinks are used for cloning whenever the source

694

For efficiency, hardlinks are used for cloning whenever the source

695

and destination are on the same filesystem. Some filesystems,

695

and destination are on the same filesystem. Some filesystems,

696

such as AFS, implement hardlinking incorrectly, but do not report

696

such as AFS, implement hardlinking incorrectly, but do not report

697

errors. In these cases, use the --pull option to avoid

697

errors. In these cases, use the --pull option to avoid

698

hardlinking.

698

hardlinking.

699

700

See pull for valid source format details.

699

"""

701

"""

700

if dest is None:

702

if dest is None:

701

dest = os.path.basename(os.path.normpath(source))

703

dest = os.path.basename(os.path.normpath(source))

702

704

703

if os.path.exists(dest):

705

if os.path.exists(dest):

704

raise util.Abort(_("destination '%s' already exists"), dest)

706

raise util.Abort(_("destination '%s' already exists"), dest)

705

707

706

dest = os.path.realpath(dest)

708

dest = os.path.realpath(dest)

707

709

708

class Dircleanup(object):

710

class Dircleanup(object):

709

def __init__(self, dir_):

711

def __init__(self, dir_):

710

self.rmtree = shutil.rmtree

712

self.rmtree = shutil.rmtree

711

self.dir_ = dir_

713

self.dir_ = dir_

712

os.mkdir(dir_)

714

os.mkdir(dir_)

713

def close(self):

715

def close(self):

714

self.dir_ = None

716

self.dir_ = None

715

def __del__(self):

717

def __del__(self):

716

if self.dir_:

718

if self.dir_:

717

self.rmtree(self.dir_, True)

719

self.rmtree(self.dir_, True)

718

720

719

if opts['ssh']:

721

if opts['ssh']:

720

ui.setconfig("ui", "ssh", opts['ssh'])

722

ui.setconfig("ui", "ssh", opts['ssh'])

721

if opts['remotecmd']:

723

if opts['remotecmd']:

722

ui.setconfig("ui", "remotecmd", opts['remotecmd'])

724

ui.setconfig("ui", "remotecmd", opts['remotecmd'])

723

725

724

if not os.path.exists(source):

726

if not os.path.exists(source):

725

source = ui.expandpath(source)

727

source = ui.expandpath(source)

726

728

727

d = Dircleanup(dest)

729

d = Dircleanup(dest)

728

abspath = source

730

abspath = source

729

other = hg.repository(ui, source)

731

other = hg.repository(ui, source)

730

732

731

copy = False

733

copy = False

732

if other.dev() != -1:

734

if other.dev() != -1:

733

abspath = os.path.abspath(source)

735

abspath = os.path.abspath(source)

734

if not opts['pull'] and not opts['rev']:

736

if not opts['pull'] and not opts['rev']:

735

copy = True

737

copy = True

736

738

737

if copy:

739

if copy:

738

try:

740

try:

739

# we use a lock here because if we race with commit, we

741

# we use a lock here because if we race with commit, we

740

# can end up with extra data in the cloned revlogs that's

742

# can end up with extra data in the cloned revlogs that's

741

# not pointed to by changesets, thus causing verify to

743

# not pointed to by changesets, thus causing verify to

742

# fail

744

# fail

743

l1 = other.lock()

745

l1 = other.lock()

744

except lock.LockException:

746

except lock.LockException:

745

copy = False

747

copy = False

746

748

747

if copy:

749

if copy:

748

# we lock here to avoid premature writing to the target

750

# we lock here to avoid premature writing to the target

749

os.mkdir(os.path.join(dest, ".hg"))

751

os.mkdir(os.path.join(dest, ".hg"))

750

l2 = lock.lock(os.path.join(dest, ".hg", "lock"))

752

l2 = lock.lock(os.path.join(dest, ".hg", "lock"))

751

753

752

files = "data 00manifest.d 00manifest.i 00changelog.d 00changelog.i"

754

files = "data 00manifest.d 00manifest.i 00changelog.d 00changelog.i"

753

for f in files.split():

755

for f in files.split():

754

src = os.path.join(source, ".hg", f)

756

src = os.path.join(source, ".hg", f)

755

dst = os.path.join(dest, ".hg", f)

757

dst = os.path.join(dest, ".hg", f)

756

try:

758

try:

757

util.copyfiles(src, dst)

759

util.copyfiles(src, dst)

758

except OSError, inst:

760

except OSError, inst:

759

if inst.errno != errno.ENOENT:

761

if inst.errno != errno.ENOENT:

760

raise

762

raise

761

763

762

repo = hg.repository(ui, dest)

764

repo = hg.repository(ui, dest)

763

765

764

else:

766

else:

765

revs = None

767

revs = None

766

if opts['rev']:

768

if opts['rev']:

767

if not other.local():

769

if not other.local():

768

error = _("clone -r not supported yet for remote repositories.")

770

error = _("clone -r not supported yet for remote repositories.")

769

raise util.Abort(error)

771

raise util.Abort(error)

770

else:

772

else:

771

revs = [other.lookup(rev) for rev in opts['rev']]

773

revs = [other.lookup(rev) for rev in opts['rev']]

772

repo = hg.repository(ui, dest, create=1)

774

repo = hg.repository(ui, dest, create=1)

773

repo.pull(other, heads = revs)

775

repo.pull(other, heads = revs)

774

776

775

f = repo.opener("hgrc", "w", text=True)

777

f = repo.opener("hgrc", "w", text=True)

776

f.write("[paths]\n")

778

f.write("[paths]\n")

777

f.write("default = %s\n" % abspath)

779

f.write("default = %s\n" % abspath)

778

f.close()

780

f.close()

779

781

780

if not opts['noupdate']:

782

if not opts['noupdate']:

781

update(ui, repo)

783

update(ui, repo)

782

784

783

d.close()

785

d.close()

784

786

785

def commit(ui, repo, *pats, **opts):

787

def commit(ui, repo, *pats, **opts):

786

"""commit the specified files or all outstanding changes

788

"""commit the specified files or all outstanding changes

787

789

788

Commit changes to the given files into the repository.

790

Commit changes to the given files into the repository.

789

791

790

If a list of files is omitted, all changes reported by "hg status"

792

If a list of files is omitted, all changes reported by "hg status"

791

will be commited.

793

will be commited.

792

794

793

The HGEDITOR or EDITOR environment variables are used to start an

795

The HGEDITOR or EDITOR environment variables are used to start an

794

editor to add a commit comment.

796

editor to add a commit comment.

795

"""

797

"""

796

message = opts['message']

798

message = opts['message']

797

logfile = opts['logfile']

799

logfile = opts['logfile']

798

800

799

if message and logfile:

801

if message and logfile:

800

raise util.Abort(_('options --message and --logfile are mutually '

802

raise util.Abort(_('options --message and --logfile are mutually '

801

'exclusive'))

803

'exclusive'))

802

if not message and logfile:

804

if not message and logfile:

803

try:

805

try:

804

if logfile == '-':

806

if logfile == '-':

805

message = sys.stdin.read()

807

message = sys.stdin.read()

806

else:

808

else:

807

message = open(logfile).read()

809

message = open(logfile).read()

808

except IOError, inst:

810

except IOError, inst:

809

raise util.Abort(_("can't read commit message '%s': %s") %

811

raise util.Abort(_("can't read commit message '%s': %s") %

810

(logfile, inst.strerror))

812

(logfile, inst.strerror))

811

813

812

if opts['addremove']:

814

if opts['addremove']:

813

addremove(ui, repo, *pats, **opts)

815

addremove(ui, repo, *pats, **opts)

814

fns, match, anypats = matchpats(repo, pats, opts)

816

fns, match, anypats = matchpats(repo, pats, opts)

815

if pats:

817

if pats:

816

modified, added, removed, deleted, unknown = (

818

modified, added, removed, deleted, unknown = (

817

repo.changes(files=fns, match=match))

819

repo.changes(files=fns, match=match))

818

files = modified + added + removed

820

files = modified + added + removed

819

else:

821

else:

820

files = []

822

files = []

821

try:

823

try:

822

repo.commit(files, message, opts['user'], opts['date'], match)

824

repo.commit(files, message, opts['user'], opts['date'], match)

823

except ValueError, inst:

825

except ValueError, inst:

824

raise util.Abort(str(inst))

826

raise util.Abort(str(inst))

825

827

826

def docopy(ui, repo, pats, opts):

828

def docopy(ui, repo, pats, opts):

827

cwd = repo.getcwd()

829

cwd = repo.getcwd()

828

errors = 0

830

errors = 0

829

copied = []

831

copied = []

830

targets = {}

832

targets = {}

831

833

832

def okaytocopy(abs, rel, exact):

834

def okaytocopy(abs, rel, exact):

833

reasons = {'?': _('is not managed'),

835

reasons = {'?': _('is not managed'),

834

'a': _('has been marked for add'),

836

'a': _('has been marked for add'),

835

'r': _('has been marked for remove')}

837

'r': _('has been marked for remove')}

836

state = repo.dirstate.state(abs)

838

state = repo.dirstate.state(abs)

837

reason = reasons.get(state)

839

reason = reasons.get(state)

838

if reason:

840

if reason:

839

if state == 'a':

841

if state == 'a':

840

origsrc = repo.dirstate.copied(abs)

842

origsrc = repo.dirstate.copied(abs)

841

if origsrc is not None:

843

if origsrc is not None:

842

return origsrc

844

return origsrc

843

if exact:

845

if exact:

844

ui.warn(_('%s: not copying - file %s\n') % (rel, reason))

846

ui.warn(_('%s: not copying - file %s\n') % (rel, reason))

845

else:

847

else:

846

return abs

848

return abs

847

849

848

def copy(origsrc, abssrc, relsrc, target, exact):

850

def copy(origsrc, abssrc, relsrc, target, exact):

849

abstarget = util.canonpath(repo.root, cwd, target)

851

abstarget = util.canonpath(repo.root, cwd, target)

850

reltarget = util.pathto(cwd, abstarget)

852

reltarget = util.pathto(cwd, abstarget)

851

prevsrc = targets.get(abstarget)

853

prevsrc = targets.get(abstarget)

852

if prevsrc is not None:

854

if prevsrc is not None:

853

ui.warn(_('%s: not overwriting - %s collides with %s\n') %

855

ui.warn(_('%s: not overwriting - %s collides with %s\n') %

854

(reltarget, abssrc, prevsrc))

856

(reltarget, abssrc, prevsrc))

855

return

857

return

856

if (not opts['after'] and os.path.exists(reltarget) or

858

if (not opts['after'] and os.path.exists(reltarget) or

857

opts['after'] and repo.dirstate.state(abstarget) not in '?r'):

859

opts['after'] and repo.dirstate.state(abstarget) not in '?r'):

858

if not opts['force']:

860

if not opts['force']:

859

ui.warn(_('%s: not overwriting - file exists\n') %

861

ui.warn(_('%s: not overwriting - file exists\n') %

860

reltarget)

862

reltarget)

861

return

863

return

862

if not opts['after']:

864

if not opts['after']:

863

os.unlink(reltarget)

865

os.unlink(reltarget)

864

if opts['after']:

866

if opts['after']:

865

if not os.path.exists(reltarget):

867

if not os.path.exists(reltarget):

866

return

868

return

867

else:

869

else:

868

targetdir = os.path.dirname(reltarget) or '.'

870

targetdir = os.path.dirname(reltarget) or '.'

869

if not os.path.isdir(targetdir):

871

if not os.path.isdir(targetdir):

870

os.makedirs(targetdir)

872

os.makedirs(targetdir)

871

try:

873

try:

872

shutil.copyfile(relsrc, reltarget)

874

shutil.copyfile(relsrc, reltarget)

873

shutil.copymode(relsrc, reltarget)

875

shutil.copymode(relsrc, reltarget)

874

except shutil.Error, inst:

876

except shutil.Error, inst:

875

raise util.Abort(str(inst))

877

raise util.Abort(str(inst))

876

except IOError, inst:

878

except IOError, inst:

877

if inst.errno == errno.ENOENT:

879

if inst.errno == errno.ENOENT:

878

ui.warn(_('%s: deleted in working copy\n') % relsrc)

880

ui.warn(_('%s: deleted in working copy\n') % relsrc)

879

else:

881

else:

880

ui.warn(_('%s: cannot copy - %s\n') %

882

ui.warn(_('%s: cannot copy - %s\n') %

881

(relsrc, inst.strerror))

883

(relsrc, inst.strerror))

882

errors += 1

884

errors += 1

883

return

885

return

884

if ui.verbose or not exact:

886

if ui.verbose or not exact:

885

ui.status(_('copying %s to %s\n') % (relsrc, reltarget))

887

ui.status(_('copying %s to %s\n') % (relsrc, reltarget))

886

targets[abstarget] = abssrc

888

targets[abstarget] = abssrc

887

repo.copy(origsrc, abstarget)

889

repo.copy(origsrc, abstarget)

888

copied.append((abssrc, relsrc, exact))

890

copied.append((abssrc, relsrc, exact))

889

891

890

def targetpathfn(pat, dest, srcs):

892

def targetpathfn(pat, dest, srcs):

891

if os.path.isdir(pat):

893

if os.path.isdir(pat):

892

abspfx = util.canonpath(repo.root, cwd, pat)

894

abspfx = util.canonpath(repo.root, cwd, pat)

893

if destdirexists:

895

if destdirexists:

894

striplen = len(os.path.split(abspfx)[0])

896

striplen = len(os.path.split(abspfx)[0])

895

else:

897

else:

896

striplen = len(abspfx)

898

striplen = len(abspfx)

897

if striplen:

899

if striplen:

898

striplen += len(os.sep)

900

striplen += len(os.sep)

899

res = lambda p: os.path.join(dest, p[striplen:])

901

res = lambda p: os.path.join(dest, p[striplen:])

900

elif destdirexists:

902

elif destdirexists:

901

res = lambda p: os.path.join(dest, os.path.basename(p))

903

res = lambda p: os.path.join(dest, os.path.basename(p))

902

else:

904

else:

903

res = lambda p: dest

905

res = lambda p: dest

904

return res

906

return res

905

907

906

def targetpathafterfn(pat, dest, srcs):

908

def targetpathafterfn(pat, dest, srcs):

907

if util.patkind(pat, None)[0]:

909

if util.patkind(pat, None)[0]:

908

# a mercurial pattern

910

# a mercurial pattern

909

res = lambda p: os.path.join(dest, os.path.basename(p))

911

res = lambda p: os.path.join(dest, os.path.basename(p))

910

else:

912

else:

911

abspfx = util.canonpath(repo.root, cwd, pat)

913

abspfx = util.canonpath(repo.root, cwd, pat)

912

if len(abspfx) < len(srcs[0][0]):

914

if len(abspfx) < len(srcs[0][0]):

913

# A directory. Either the target path contains the last

915

# A directory. Either the target path contains the last

914

# component of the source path or it does not.

916

# component of the source path or it does not.

915

def evalpath(striplen):

917

def evalpath(striplen):

916

score = 0

918

score = 0

917

for s in srcs:

919

for s in srcs:

918

t = os.path.join(dest, s[0][striplen:])

920

t = os.path.join(dest, s[0][striplen:])

919

if os.path.exists(t):

921

if os.path.exists(t):

920

score += 1

922

score += 1

921

return score

923

return score

922

924

923

striplen = len(abspfx)

925

striplen = len(abspfx)

924

if striplen:

926

if striplen:

925

striplen += len(os.sep)

927

striplen += len(os.sep)

926

if os.path.isdir(os.path.join(dest, os.path.split(abspfx)[1])):

928

if os.path.isdir(os.path.join(dest, os.path.split(abspfx)[1])):

927

score = evalpath(striplen)

929

score = evalpath(striplen)

928

striplen1 = len(os.path.split(abspfx)[0])

930

striplen1 = len(os.path.split(abspfx)[0])

929

if striplen1:

931

if striplen1:

930

striplen1 += len(os.sep)

932

striplen1 += len(os.sep)

931

if evalpath(striplen1) > score:

933

if evalpath(striplen1) > score:

932

striplen = striplen1

934

striplen = striplen1

933

res = lambda p: os.path.join(dest, p[striplen:])

935

res = lambda p: os.path.join(dest, p[striplen:])

934

else:

936

else:

935

# a file

937

# a file

936

if destdirexists:

938

if destdirexists:

937

res = lambda p: os.path.join(dest, os.path.basename(p))

939

res = lambda p: os.path.join(dest, os.path.basename(p))

938

else:

940

else:

939

res = lambda p: dest

941

res = lambda p: dest

940

return res

942

return res

941

943

942

944

943

pats = list(pats)

945

pats = list(pats)

944

if not pats:

946

if not pats:

945

raise util.Abort(_('no source or destination specified'))

947

raise util.Abort(_('no source or destination specified'))

946

if len(pats) == 1:

948

if len(pats) == 1:

947

raise util.Abort(_('no destination specified'))

949

raise util.Abort(_('no destination specified'))

948

dest = pats.pop()

950

dest = pats.pop()

949

destdirexists = os.path.isdir(dest)

951

destdirexists = os.path.isdir(dest)

950

if (len(pats) > 1 or util.patkind(pats[0], None)[0]) and not destdirexists:

952

if (len(pats) > 1 or util.patkind(pats[0], None)[0]) and not destdirexists:

951

raise util.Abort(_('with multiple sources, destination must be an '

953

raise util.Abort(_('with multiple sources, destination must be an '

952

'existing directory'))

954

'existing directory'))

953

if opts['after']:

955

if opts['after']:

954

tfn = targetpathafterfn

956

tfn = targetpathafterfn

955

else:

957

else:

956

tfn = targetpathfn

958

tfn = targetpathfn

957

copylist = []

959

copylist = []

958

for pat in pats:

960

for pat in pats:

959

srcs = []

961

srcs = []

960

for tag, abssrc, relsrc, exact in walk(repo, [pat], opts):

962

for tag, abssrc, relsrc, exact in walk(repo, [pat], opts):

961

origsrc = okaytocopy(abssrc, relsrc, exact)

963

origsrc = okaytocopy(abssrc, relsrc, exact)

962

if origsrc:

964

if origsrc:

963

srcs.append((origsrc, abssrc, relsrc, exact))

965

srcs.append((origsrc, abssrc, relsrc, exact))

964

if not srcs:

966

if not srcs:

965

continue

967

continue

966

copylist.append((tfn(pat, dest, srcs), srcs))

968

copylist.append((tfn(pat, dest, srcs), srcs))

967

if not copylist:

969

if not copylist:

968

raise util.Abort(_('no files to copy'))

970

raise util.Abort(_('no files to copy'))

969

971

970

for targetpath, srcs in copylist:

972

for targetpath, srcs in copylist:

971

for origsrc, abssrc, relsrc, exact in srcs:

973

for origsrc, abssrc, relsrc, exact in srcs:

972

copy(origsrc, abssrc, relsrc, targetpath(abssrc), exact)

974

copy(origsrc, abssrc, relsrc, targetpath(abssrc), exact)

973

975

974

if errors:

976

if errors:

975

ui.warn(_('(consider using --after)\n'))

977

ui.warn(_('(consider using --after)\n'))

976

return errors, copied

978

return errors, copied

977

979

978

def copy(ui, repo, *pats, **opts):

980

def copy(ui, repo, *pats, **opts):

979

"""mark files as copied for the next commit

981

"""mark files as copied for the next commit

980

982

981

Mark dest as having copies of source files. If dest is a

983

Mark dest as having copies of source files. If dest is a

982

directory, copies are put in that directory. If dest is a file,

984

directory, copies are put in that directory. If dest is a file,

983

there can only be one source.

985

there can only be one source.

984

986

985

By default, this command copies the contents of files as they

987

By default, this command copies the contents of files as they

986

stand in the working directory. If invoked with --after, the

988

stand in the working directory. If invoked with --after, the

987

operation is recorded, but no copying is performed.

989

operation is recorded, but no copying is performed.

988

990

989

This command takes effect in the next commit.

991

This command takes effect in the next commit.

990

992

991

NOTE: This command should be treated as experimental. While it

993

NOTE: This command should be treated as experimental. While it

992

should properly record copied files, this information is not yet

994

should properly record copied files, this information is not yet

993

fully used by merge, nor fully reported by log.

995

fully used by merge, nor fully reported by log.

994

"""

996

"""

995

errs, copied = docopy(ui, repo, pats, opts)

997

errs, copied = docopy(ui, repo, pats, opts)

996

return errs

998

return errs

997

999

998

def debugancestor(ui, index, rev1, rev2):

1000

def debugancestor(ui, index, rev1, rev2):

999

"""find the ancestor revision of two revisions in a given index"""

1001

"""find the ancestor revision of two revisions in a given index"""

1000

r = revlog.revlog(util.opener(os.getcwd()), index, "")

1002

r = revlog.revlog(util.opener(os.getcwd()), index, "")

1001

a = r.ancestor(r.lookup(rev1), r.lookup(rev2))

1003

a = r.ancestor(r.lookup(rev1), r.lookup(rev2))

1002

ui.write("%d:%s\n" % (r.rev(a), hex(a)))

1004

ui.write("%d:%s\n" % (r.rev(a), hex(a)))

1003

1005

1004

def debugrebuildstate(ui, repo, rev=None):

1006

def debugrebuildstate(ui, repo, rev=None):

1005

"""rebuild the dirstate as it would look like for the given revision"""

1007

"""rebuild the dirstate as it would look like for the given revision"""

1006

if not rev:

1008

if not rev:

1007

rev = repo.changelog.tip()

1009

rev = repo.changelog.tip()

1008

else:

1010

else:

1009

rev = repo.lookup(rev)

1011

rev = repo.lookup(rev)

1010

change = repo.changelog.read(rev)

1012

change = repo.changelog.read(rev)

1011

n = change[0]

1013

n = change[0]

1012

files = repo.manifest.readflags(n)

1014

files = repo.manifest.readflags(n)

1013

wlock = repo.wlock()

1015

wlock = repo.wlock()

1014

repo.dirstate.rebuild(rev, files.iteritems())

1016

repo.dirstate.rebuild(rev, files.iteritems())

1015

1017

1016

def debugcheckstate(ui, repo):

1018

def debugcheckstate(ui, repo):

1017

"""validate the correctness of the current dirstate"""

1019

"""validate the correctness of the current dirstate"""

1018

parent1, parent2 = repo.dirstate.parents()

1020

parent1, parent2 = repo.dirstate.parents()

1019

repo.dirstate.read()

1021

repo.dirstate.read()

1020

dc = repo.dirstate.map

1022

dc = repo.dirstate.map

1021

keys = dc.keys()

1023

keys = dc.keys()

1022

keys.sort()

1024

keys.sort()

1023

m1n = repo.changelog.read(parent1)[0]

1025

m1n = repo.changelog.read(parent1)[0]

1024

m2n = repo.changelog.read(parent2)[0]

1026

m2n = repo.changelog.read(parent2)[0]

1025

m1 = repo.manifest.read(m1n)

1027

m1 = repo.manifest.read(m1n)

1026

m2 = repo.manifest.read(m2n)

1028

m2 = repo.manifest.read(m2n)

1027

errors = 0

1029

errors = 0

1028

for f in dc:

1030

for f in dc:

1029

state = repo.dirstate.state(f)

1031

state = repo.dirstate.state(f)

1030

if state in "nr" and f not in m1:

1032

if state in "nr" and f not in m1:

1031

ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))

1033

ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))

1032

errors += 1

1034

errors += 1

1033

if state in "a" and f in m1:

1035

if state in "a" and f in m1:

1034

ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))

1036

ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))

1035

errors += 1

1037

errors += 1

1036

if state in "m" and f not in m1 and f not in m2:

1038

if state in "m" and f not in m1 and f not in m2:

1037

ui.warn(_("%s in state %s, but not in either manifest\n") %

1039

ui.warn(_("%s in state %s, but not in either manifest\n") %

1038

(f, state))

1040

(f, state))

1039

errors += 1

1041

errors += 1

1040

for f in m1:

1042

for f in m1:

1041

state = repo.dirstate.state(f)

1043

state = repo.dirstate.state(f)

1042

if state not in "nrm":

1044

if state not in "nrm":

1043

ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))

1045

ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))

1044

errors += 1

1046

errors += 1

1045

if errors:

1047

if errors:

1046

error = _(".hg/dirstate inconsistent with current parent's manifest")

1048

error = _(".hg/dirstate inconsistent with current parent's manifest")

1047

raise util.Abort(error)

1049

raise util.Abort(error)

1048

1050

1049

def debugconfig(ui):

1051

def debugconfig(ui):

1050

"""show combined config settings from all hgrc files"""

1052

"""show combined config settings from all hgrc files"""

1051

try:

1053

try:

1052

repo = hg.repository(ui)

1054

repo = hg.repository(ui)

1053

except hg.RepoError:

1055

except hg.RepoError:

1054

pass

1056

pass

1055

for section, name, value in ui.walkconfig():

1057

for section, name, value in ui.walkconfig():

1056

ui.write('%s.%s=%s\n' % (section, name, value))

1058

ui.write('%s.%s=%s\n' % (section, name, value))

1057

1059

1058

def debugsetparents(ui, repo, rev1, rev2=None):

1060

def debugsetparents(ui, repo, rev1, rev2=None):

1059

"""manually set the parents of the current working directory

1061

"""manually set the parents of the current working directory

1060

1062

1061

This is useful for writing repository conversion tools, but should

1063

This is useful for writing repository conversion tools, but should

1062

be used with care.

1064

be used with care.

1063

"""

1065

"""

1064

1066

1065

if not rev2:

1067

if not rev2:

1066

rev2 = hex(nullid)

1068

rev2 = hex(nullid)

1067

1069

1068

repo.dirstate.setparents(repo.lookup(rev1), repo.lookup(rev2))

1070

repo.dirstate.setparents(repo.lookup(rev1), repo.lookup(rev2))

1069

1071

1070

def debugstate(ui, repo):

1072

def debugstate(ui, repo):

1071

"""show the contents of the current dirstate"""

1073

"""show the contents of the current dirstate"""

1072

repo.dirstate.read()

1074

repo.dirstate.read()

1073

dc = repo.dirstate.map

1075

dc = repo.dirstate.map

1074

keys = dc.keys()

1076

keys = dc.keys()

1075

keys.sort()

1077

keys.sort()

1076

for file_ in keys:

1078

for file_ in keys:

1077

ui.write("%c %3o %10d %s %s\n"

1079

ui.write("%c %3o %10d %s %s\n"

1078

% (dc[file_][0], dc[file_][1] & 0777, dc[file_][2],

1080

% (dc[file_][0], dc[file_][1] & 0777, dc[file_][2],

1079

time.strftime("%x %X",

1081

time.strftime("%x %X",

1080

time.localtime(dc[file_][3])), file_))

1082

time.localtime(dc[file_][3])), file_))

1081

for f in repo.dirstate.copies:

1083

for f in repo.dirstate.copies:

1082

ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copies[f], f))

1084

ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copies[f], f))

1083

1085

1084

def debugdata(ui, file_, rev):

1086

def debugdata(ui, file_, rev):

1085

"""dump the contents of an data file revision"""

1087

"""dump the contents of an data file revision"""

1086

r = revlog.revlog(util.opener(os.getcwd()), file_[:-2] + ".i", file_)

1088

r = revlog.revlog(util.opener(os.getcwd()), file_[:-2] + ".i", file_)

1087

try:

1089

try:

1088

ui.write(r.revision(r.lookup(rev)))

1090

ui.write(r.revision(r.lookup(rev)))

1089

except KeyError:

1091

except KeyError:

1090

raise util.Abort(_('invalid revision identifier %s'), rev)

1092

raise util.Abort(_('invalid revision identifier %s'), rev)

1091

1093

1092

def debugindex(ui, file_):

1094

def debugindex(ui, file_):

1093

"""dump the contents of an index file"""

1095

"""dump the contents of an index file"""

1094

r = revlog.revlog(util.opener(os.getcwd()), file_, "")

1096

r = revlog.revlog(util.opener(os.getcwd()), file_, "")

1095

ui.write(" rev offset length base linkrev" +

1097

ui.write(" rev offset length base linkrev" +

1096

" nodeid p1 p2\n")

1098

" nodeid p1 p2\n")

1097

for i in range(r.count()):

1099

for i in range(r.count()):

1098

e = r.index[i]

1100

e = r.index[i]

1099

ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (

1101

ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (

1100

i, e[0], e[1], e[2], e[3],

1102

i, e[0], e[1], e[2], e[3],

1101

short(e[6]), short(e[4]), short(e[5])))

1103

short(e[6]), short(e[4]), short(e[5])))

1102

1104

1103

def debugindexdot(ui, file_):

1105

def debugindexdot(ui, file_):

1104

"""dump an index DAG as a .dot file"""

1106

"""dump an index DAG as a .dot file"""

1105

r = revlog.revlog(util.opener(os.getcwd()), file_, "")

1107

r = revlog.revlog(util.opener(os.getcwd()), file_, "")

1106

ui.write("digraph G {\n")

1108

ui.write("digraph G {\n")

1107

for i in range(r.count()):

1109

for i in range(r.count()):

1108

e = r.index[i]

1110

e = r.index[i]

1109

ui.write("\t%d -> %d\n" % (r.rev(e[4]), i))

1111

ui.write("\t%d -> %d\n" % (r.rev(e[4]), i))

1110

if e[5] != nullid:

1112

if e[5] != nullid:

1111

ui.write("\t%d -> %d\n" % (r.rev(e[5]), i))

1113

ui.write("\t%d -> %d\n" % (r.rev(e[5]), i))

1112

ui.write("}\n")

1114

ui.write("}\n")

1113

1115

1114

def debugrename(ui, repo, file, rev=None):

1116

def debugrename(ui, repo, file, rev=None):

1115

"""dump rename information"""

1117

"""dump rename information"""

1116

r = repo.file(relpath(repo, [file])[0])

1118

r = repo.file(relpath(repo, [file])[0])

1117

if rev:

1119

if rev:

1118

try:

1120

try:

1119

# assume all revision numbers are for changesets

1121

# assume all revision numbers are for changesets

1120

n = repo.lookup(rev)

1122

n = repo.lookup(rev)

1121

change = repo.changelog.read(n)

1123

change = repo.changelog.read(n)

1122

m = repo.manifest.read(change[0])

1124

m = repo.manifest.read(change[0])

1123

n = m[relpath(repo, [file])[0]]

1125

n = m[relpath(repo, [file])[0]]

1124

except (hg.RepoError, KeyError):

1126

except (hg.RepoError, KeyError):

1125

n = r.lookup(rev)

1127

n = r.lookup(rev)

1126

else:

1128

else:

1127

n = r.tip()

1129

n = r.tip()

1128

m = r.renamed(n)

1130

m = r.renamed(n)

1129

if m:

1131

if m:

1130

ui.write(_("renamed from %s:%s\n") % (m[0], hex(m[1])))

1132

ui.write(_("renamed from %s:%s\n") % (m[0], hex(m[1])))

1131

else:

1133

else:

1132

ui.write(_("not renamed\n"))

1134

ui.write(_("not renamed\n"))

1133

1135

1134

def debugwalk(ui, repo, *pats, **opts):

1136

def debugwalk(ui, repo, *pats, **opts):

1135

"""show how files match on given patterns"""

1137

"""show how files match on given patterns"""

1136

items = list(walk(repo, pats, opts))

1138

items = list(walk(repo, pats, opts))

1137

if not items:

1139

if not items:

1138

return

1140

return

1139

fmt = '%%s %%-%ds %%-%ds %%s' % (

1141

fmt = '%%s %%-%ds %%-%ds %%s' % (

1140

max([len(abs) for (src, abs, rel, exact) in items]),

1142

max([len(abs) for (src, abs, rel, exact) in items]),

1141

max([len(rel) for (src, abs, rel, exact) in items]))

1143

max([len(rel) for (src, abs, rel, exact) in items]))

1142

for src, abs, rel, exact in items:

1144

for src, abs, rel, exact in items:

1143

line = fmt % (src, abs, rel, exact and 'exact' or '')

1145

line = fmt % (src, abs, rel, exact and 'exact' or '')

1144

ui.write("%s\n" % line.rstrip())

1146

ui.write("%s\n" % line.rstrip())

1145

1147

1146

def diff(ui, repo, *pats, **opts):

1148

def diff(ui, repo, *pats, **opts):

1147

"""diff repository (or selected files)

1149

"""diff repository (or selected files)

1148

1150

1149

Show differences between revisions for the specified files.

1151

Show differences between revisions for the specified files.

1150

1152

1151

Differences between files are shown using the unified diff format.

1153

Differences between files are shown using the unified diff format.

1152

1154

1153

When two revision arguments are given, then changes are shown

1155

When two revision arguments are given, then changes are shown

1154

between those revisions. If only one revision is specified then

1156

between those revisions. If only one revision is specified then

1155

that revision is compared to the working directory, and, when no

1157

that revision is compared to the working directory, and, when no

1156

revisions are specified, the working directory files are compared

1158

revisions are specified, the working directory files are compared

1157

to its parent.

1159

to its parent.

1158

1160

1159

Without the -a option, diff will avoid generating diffs of files

1161

Without the -a option, diff will avoid generating diffs of files

1160

it detects as binary. With -a, diff will generate a diff anyway,

1162

it detects as binary. With -a, diff will generate a diff anyway,

1161

probably with undesirable results.

1163

probably with undesirable results.

1162

"""

1164

"""

1163

node1, node2 = None, None

1165

node1, node2 = None, None

1164

revs = [repo.lookup(x) for x in opts['rev']]

1166

revs = [repo.lookup(x) for x in opts['rev']]

1165

1167

1166

if len(revs) > 0:

1168

if len(revs) > 0:

1167

node1 = revs[0]

1169

node1 = revs[0]

1168

if len(revs) > 1:

1170

if len(revs) > 1:

1169

node2 = revs[1]

1171

node2 = revs[1]

1170

if len(revs) > 2:

1172

if len(revs) > 2:

1171

raise util.Abort(_("too many revisions to diff"))

1173

raise util.Abort(_("too many revisions to diff"))

1172

1174

1173

fns, matchfn, anypats = matchpats(repo, pats, opts)

1175

fns, matchfn, anypats = matchpats(repo, pats, opts)

1174

1176

1175

dodiff(sys.stdout, ui, repo, node1, node2, fns, match=matchfn,

1177

dodiff(sys.stdout, ui, repo, node1, node2, fns, match=matchfn,

1176

text=opts['text'], opts=opts)

1178

text=opts['text'], opts=opts)

1177

1179

1178

def doexport(ui, repo, changeset, seqno, total, revwidth, opts):

1180

def doexport(ui, repo, changeset, seqno, total, revwidth, opts):

1179

node = repo.lookup(changeset)

1181

node = repo.lookup(changeset)

1180

parents = [p for p in repo.changelog.parents(node) if p != nullid]

1182

parents = [p for p in repo.changelog.parents(node) if p != nullid]

1181

if opts['switch_parent']:

1183

if opts['switch_parent']:

1182

parents.reverse()

1184

parents.reverse()

1183

prev = (parents and parents[0]) or nullid

1185

prev = (parents and parents[0]) or nullid

1184

change = repo.changelog.read(node)

1186

change = repo.changelog.read(node)

1185

1187

1186

fp = make_file(repo, repo.changelog, opts['output'],

1188

fp = make_file(repo, repo.changelog, opts['output'],

1187

node=node, total=total, seqno=seqno,

1189

node=node, total=total, seqno=seqno,

1188

revwidth=revwidth)

1190

revwidth=revwidth)

1189

if fp != sys.stdout:

1191

if fp != sys.stdout:

1190

ui.note("%s\n" % fp.name)

1192

ui.note("%s\n" % fp.name)

1191

1193

1192

fp.write("# HG changeset patch\n")

1194

fp.write("# HG changeset patch\n")

1193

fp.write("# User %s\n" % change[1])

1195

fp.write("# User %s\n" % change[1])

1194

fp.write("# Node ID %s\n" % hex(node))

1196

fp.write("# Node ID %s\n" % hex(node))

1195

fp.write("# Parent %s\n" % hex(prev))

1197

fp.write("# Parent %s\n" % hex(prev))

1196

if len(parents) > 1:

1198

if len(parents) > 1:

1197

fp.write("# Parent %s\n" % hex(parents[1]))

1199

fp.write("# Parent %s\n" % hex(parents[1]))

1198

fp.write(change[4].rstrip())

1200

fp.write(change[4].rstrip())

1199

fp.write("\n\n")

1201

fp.write("\n\n")

1200

1202

1201

dodiff(fp, ui, repo, prev, node, text=opts['text'])

1203

dodiff(fp, ui, repo, prev, node, text=opts['text'])

1202

if fp != sys.stdout:

1204

if fp != sys.stdout:

1203

fp.close()

1205

fp.close()

1204

1206

1205

def export(ui, repo, *changesets, **opts):

1207

def export(ui, repo, *changesets, **opts):

1206

"""dump the header and diffs for one or more changesets

1208

"""dump the header and diffs for one or more changesets

1207

1209

1208

Print the changeset header and diffs for one or more revisions.

1210

Print the changeset header and diffs for one or more revisions.

1209

1211

1210

The information shown in the changeset header is: author,

1212

The information shown in the changeset header is: author,

1211

changeset hash, parent and commit comment.

1213

changeset hash, parent and commit comment.

1212

1214

1213

Output may be to a file, in which case the name of the file is

1215

Output may be to a file, in which case the name of the file is

1214

given using a format string. The formatting rules are as follows:

1216

given using a format string. The formatting rules are as follows:

1215

1217

1216

%% literal "%" character

1218

%% literal "%" character

1217

%H changeset hash (40 bytes of hexadecimal)

1219

%H changeset hash (40 bytes of hexadecimal)

1218

%N number of patches being generated

1220

%N number of patches being generated

1219

%R changeset revision number

1221

%R changeset revision number

1220

%b basename of the exporting repository

1222

%b basename of the exporting repository

1221

%h short-form changeset hash (12 bytes of hexadecimal)

1223

%h short-form changeset hash (12 bytes of hexadecimal)

1222

%n zero-padded sequence number, starting at 1

1224

%n zero-padded sequence number, starting at 1

1223

%r zero-padded changeset revision number

1225

%r zero-padded changeset revision number

1224

1226

1225

Without the -a option, export will avoid generating diffs of files

1227

Without the -a option, export will avoid generating diffs of files

1226

it detects as binary. With -a, export will generate a diff anyway,

1228

it detects as binary. With -a, export will generate a diff anyway,

1227

probably with undesirable results.

1229

probably with undesirable results.

1228

1230

1229

With the --switch-parent option, the diff will be against the second

1231

With the --switch-parent option, the diff will be against the second

1230

parent. It can be useful to review a merge.

1232

parent. It can be useful to review a merge.

1231

"""

1233

"""

1232

if not changesets:

1234

if not changesets:

1233

raise util.Abort(_("export requires at least one changeset"))

1235

raise util.Abort(_("export requires at least one changeset"))

1234

seqno = 0

1236

seqno = 0

1235

revs = list(revrange(ui, repo, changesets))

1237

revs = list(revrange(ui, repo, changesets))

1236

total = len(revs)

1238

total = len(revs)

1237

revwidth = max(map(len, revs))

1239

revwidth = max(map(len, revs))

1238

msg = len(revs) > 1 and _("Exporting patches:\n") or _("Exporting patch:\n")

1240

msg = len(revs) > 1 and _("Exporting patches:\n") or _("Exporting patch:\n")

1239

ui.note(msg)

1241

ui.note(msg)

1240

for cset in revs:

1242

for cset in revs:

1241

seqno += 1

1243

seqno += 1

1242

doexport(ui, repo, cset, seqno, total, revwidth, opts)

1244

doexport(ui, repo, cset, seqno, total, revwidth, opts)

1243

1245

1244

def forget(ui, repo, *pats, **opts):

1246

def forget(ui, repo, *pats, **opts):

1245

"""don't add the specified files on the next commit

1247

"""don't add the specified files on the next commit

1246

1248

1247

Undo an 'hg add' scheduled for the next commit.

1249

Undo an 'hg add' scheduled for the next commit.

1248

"""

1250

"""

1249

forget = []

1251

forget = []

1250

for src, abs, rel, exact in walk(repo, pats, opts):

1252

for src, abs, rel, exact in walk(repo, pats, opts):

1251

if repo.dirstate.state(abs) == 'a':

1253

if repo.dirstate.state(abs) == 'a':

1252

forget.append(abs)

1254

forget.append(abs)

1253

if ui.verbose or not exact:

1255

if ui.verbose or not exact:

1254

ui.status(_('forgetting %s\n') % ((pats and rel) or abs))

1256

ui.status(_('forgetting %s\n') % ((pats and rel) or abs))

1255

repo.forget(forget)

1257

repo.forget(forget)

1256

1258

1257

def grep(ui, repo, pattern, *pats, **opts):

1259

def grep(ui, repo, pattern, *pats, **opts):

1258

"""search for a pattern in specified files and revisions

1260

"""search for a pattern in specified files and revisions

1259

1261

1260

Search revisions of files for a regular expression.

1262

Search revisions of files for a regular expression.

1261

1263

1262

This command behaves differently than Unix grep. It only accepts

1264

This command behaves differently than Unix grep. It only accepts

1263

Python/Perl regexps. It searches repository history, not the

1265

Python/Perl regexps. It searches repository history, not the

1264

working directory. It always prints the revision number in which

1266

working directory. It always prints the revision number in which

1265

a match appears.

1267

a match appears.

1266

1268

1267

By default, grep only prints output for the first revision of a

1269

By default, grep only prints output for the first revision of a

1268

file in which it finds a match. To get it to print every revision

1270

file in which it finds a match. To get it to print every revision

1269

that contains a change in match status ("-" for a match that

1271

that contains a change in match status ("-" for a match that

1270

becomes a non-match, or "+" for a non-match that becomes a match),

1272

becomes a non-match, or "+" for a non-match that becomes a match),

1271

use the --all flag.

1273

use the --all flag.

1272

"""

1274

"""

1273

reflags = 0

1275

reflags = 0

1274

if opts['ignore_case']:

1276

if opts['ignore_case']:

1275

reflags |= re.I

1277

reflags |= re.I

1276

regexp = re.compile(pattern, reflags)

1278

regexp = re.compile(pattern, reflags)

1277

sep, eol = ':', '\n'

1279

sep, eol = ':', '\n'

1278

if opts['print0']:

1280

if opts['print0']:

1279

sep = eol = '\0'

1281

sep = eol = '\0'

1280

1282

1281

fcache = {}

1283

fcache = {}

1282

def getfile(fn):

1284

def getfile(fn):

1283

if fn not in fcache:

1285

if fn not in fcache:

1284

fcache[fn] = repo.file(fn)

1286

fcache[fn] = repo.file(fn)

1285

return fcache[fn]

1287

return fcache[fn]

1286

1288

1287

def matchlines(body):

1289

def matchlines(body):

1288

begin = 0

1290

begin = 0

1289

linenum = 0

1291

linenum = 0

1290

while True:

1292

while True:

1291

match = regexp.search(body, begin)

1293

match = regexp.search(body, begin)

1292

if not match:

1294

if not match:

1293

break

1295

break

1294

mstart, mend = match.span()

1296

mstart, mend = match.span()

1295

linenum += body.count('\n', begin, mstart) + 1

1297

linenum += body.count('\n', begin, mstart) + 1

1296

lstart = body.rfind('\n', begin, mstart) + 1 or begin

1298

lstart = body.rfind('\n', begin, mstart) + 1 or begin

1297

lend = body.find('\n', mend)

1299

lend = body.find('\n', mend)

1298

yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]

1300

yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]

1299

begin = lend + 1

1301

begin = lend + 1

1300

1302

1301

class linestate(object):

1303

class linestate(object):

1302

def __init__(self, line, linenum, colstart, colend):

1304

def __init__(self, line, linenum, colstart, colend):

1303

self.line = line

1305

self.line = line

1304

self.linenum = linenum

1306

self.linenum = linenum

1305

self.colstart = colstart

1307

self.colstart = colstart

1306

self.colend = colend

1308

self.colend = colend

1307

def __eq__(self, other):

1309

def __eq__(self, other):

1308

return self.line == other.line

1310

return self.line == other.line

1309

def __hash__(self):

1311

def __hash__(self):

1310

return hash(self.line)

1312

return hash(self.line)

1311

1313

1312

matches = {}

1314

matches = {}

1313

def grepbody(fn, rev, body):

1315

def grepbody(fn, rev, body):

1314

matches[rev].setdefault(fn, {})

1316

matches[rev].setdefault(fn, {})

1315

m = matches[rev][fn]

1317

m = matches[rev][fn]

1316

for lnum, cstart, cend, line in matchlines(body):

1318

for lnum, cstart, cend, line in matchlines(body):

1317

s = linestate(line, lnum, cstart, cend)

1319

s = linestate(line, lnum, cstart, cend)

1318

m[s] = s

1320

m[s] = s

1319

1321

1320

# FIXME: prev isn't used, why ?

1322

# FIXME: prev isn't used, why ?

1321

prev = {}

1323

prev = {}

1322

ucache = {}

1324

ucache = {}

1323

def display(fn, rev, states, prevstates):

1325

def display(fn, rev, states, prevstates):

1324

diff = list(sets.Set(states).symmetric_difference(sets.Set(prevstates)))

1326

diff = list(sets.Set(states).symmetric_difference(sets.Set(prevstates)))

1325

diff.sort(lambda x, y: cmp(x.linenum, y.linenum))

1327

diff.sort(lambda x, y: cmp(x.linenum, y.linenum))

1326

counts = {'-': 0, '+': 0}

1328

counts = {'-': 0, '+': 0}

1327

filerevmatches = {}

1329

filerevmatches = {}

1328

for l in diff:

1330

for l in diff:

1329

if incrementing or not opts['all']:

1331

if incrementing or not opts['all']:

1330

change = ((l in prevstates) and '-') or '+'

1332

change = ((l in prevstates) and '-') or '+'

1331

r = rev

1333

r = rev

1332

else:

1334

else:

1333

change = ((l in states) and '-') or '+'

1335

change = ((l in states) and '-') or '+'

1334

r = prev[fn]

1336

r = prev[fn]

1335

cols = [fn, str(rev)]

1337

cols = [fn, str(rev)]

1336

if opts['line_number']:

1338

if opts['line_number']:

1337

cols.append(str(l.linenum))

1339

cols.append(str(l.linenum))

1338

if opts['all']:

1340

if opts['all']:

1339

cols.append(change)

1341

cols.append(change)

1340

if opts['user']:

1342

if opts['user']:

1341

cols.append(trimuser(ui, getchange(rev)[1], rev,

1343

cols.append(trimuser(ui, getchange(rev)[1], rev,

1342

ucache))

1344

ucache))

1343

if opts['files_with_matches']:

1345

if opts['files_with_matches']:

1344

c = (fn, rev)

1346

c = (fn, rev)

1345

if c in filerevmatches:

1347

if c in filerevmatches:

1346

continue

1348

continue

1347

filerevmatches[c] = 1

1349

filerevmatches[c] = 1

1348

else:

1350

else:

1349

cols.append(l.line)

1351

cols.append(l.line)

1350

ui.write(sep.join(cols), eol)

1352

ui.write(sep.join(cols), eol)

1351

counts[change] += 1

1353

counts[change] += 1

1352

return counts['+'], counts['-']

1354

return counts['+'], counts['-']

1353

1355

1354

fstate = {}

1356

fstate = {}

1355

skip = {}

1357

skip = {}

1356

changeiter, getchange, matchfn = walkchangerevs(ui, repo, pats, opts)

1358

changeiter, getchange, matchfn = walkchangerevs(ui, repo, pats, opts)

1357

count = 0

1359

count = 0

1358

incrementing = False

1360

incrementing = False

1359

for st, rev, fns in changeiter:

1361

for st, rev, fns in changeiter:

1360

if st == 'window':

1362

if st == 'window':

1361

incrementing = rev

1363

incrementing = rev

1362

matches.clear()

1364

matches.clear()

1363

elif st == 'add':

1365

elif st == 'add':

1364

change = repo.changelog.read(repo.lookup(str(rev)))

1366

change = repo.changelog.read(repo.lookup(str(rev)))

1365

mf = repo.manifest.read(change[0])

1367

mf = repo.manifest.read(change[0])

1366

matches[rev] = {}

1368

matches[rev] = {}

1367

for fn in fns:

1369

for fn in fns:

1368

if fn in skip:

1370

if fn in skip:

1369

continue

1371

continue

1370

fstate.setdefault(fn, {})

1372

fstate.setdefault(fn, {})

1371

try:

1373

try:

1372

grepbody(fn, rev, getfile(fn).read(mf[fn]))

1374

grepbody(fn, rev, getfile(fn).read(mf[fn]))

1373

except KeyError:

1375

except KeyError:

1374

pass

1376

pass

1375

elif st == 'iter':

1377

elif st == 'iter':

1376

states = matches[rev].items()

1378

states = matches[rev].items()

1377

states.sort()

1379

states.sort()

1378

for fn, m in states:

1380

for fn, m in states:

1379

if fn in skip:

1381

if fn in skip:

1380

continue

1382

continue

1381

if incrementing or not opts['all'] or fstate[fn]:

1383

if incrementing or not opts['all'] or fstate[fn]:

1382

pos, neg = display(fn, rev, m, fstate[fn])

1384

pos, neg = display(fn, rev, m, fstate[fn])

1383

count += pos + neg

1385

count += pos + neg

1384

if pos and not opts['all']:

1386

if pos and not opts['all']:

1385

skip[fn] = True

1387

skip[fn] = True

1386

fstate[fn] = m

1388

fstate[fn] = m

1387

prev[fn] = rev

1389

prev[fn] = rev

1388

1390

1389

if not incrementing:

1391

if not incrementing:

1390

fstate = fstate.items()

1392

fstate = fstate.items()

1391

fstate.sort()

1393

fstate.sort()

1392

for fn, state in fstate:

1394

for fn, state in fstate:

1393

if fn in skip:

1395

if fn in skip:

1394

continue

1396

continue

1395

display(fn, rev, {}, state)

1397

display(fn, rev, {}, state)

1396

return (count == 0 and 1) or 0

1398

return (count == 0 and 1) or 0

1397

1399

1398

def heads(ui, repo, **opts):

1400

def heads(ui, repo, **opts):

1399

"""show current repository heads

1401

"""show current repository heads

1400

1402

1401

Show all repository head changesets.

1403

Show all repository head changesets.

1402

1404

1403

Repository "heads" are changesets that don't have children

1405

Repository "heads" are changesets that don't have children

1404

changesets. They are where development generally takes place and

1406

changesets. They are where development generally takes place and

1405

are the usual targets for update and merge operations.

1407

are the usual targets for update and merge operations.

1406

"""

1408

"""

1407

if opts['rev']:

1409

if opts['rev']:

1408

heads = repo.heads(repo.lookup(opts['rev']))

1410

heads = repo.heads(repo.lookup(opts['rev']))

1409

else:

1411

else:

1410

heads = repo.heads()

1412

heads = repo.heads()

1411

br = None

1413

br = None

1412

if opts['branches']:

1414

if opts['branches']:

1413

br = repo.branchlookup(heads)

1415

br = repo.branchlookup(heads)

1414

for n in heads:

1416

for n in heads:

1415

show_changeset(ui, repo, changenode=n, brinfo=br)

1417

show_changeset(ui, repo, changenode=n, brinfo=br)

1416

1418

1417

def identify(ui, repo):

1419

def identify(ui, repo):

1418

"""print information about the working copy

1420

"""print information about the working copy

1419

1421

1420

Print a short summary of the current state of the repo.

1422

Print a short summary of the current state of the repo.

1421

1423

1422

This summary identifies the repository state using one or two parent

1424

This summary identifies the repository state using one or two parent

1423

hash identifiers, followed by a "+" if there are uncommitted changes

1425

hash identifiers, followed by a "+" if there are uncommitted changes

1424

in the working directory, followed by a list of tags for this revision.

1426

in the working directory, followed by a list of tags for this revision.

1425

"""

1427

"""

1426

parents = [p for p in repo.dirstate.parents() if p != nullid]

1428

parents = [p for p in repo.dirstate.parents() if p != nullid]

1427

if not parents:

1429

if not parents:

1428

ui.write(_("unknown\n"))

1430

ui.write(_("unknown\n"))

1429

return

1431

return

1430

1432

1431

hexfunc = ui.verbose and hex or short

1433

hexfunc = ui.verbose and hex or short

1432

modified, added, removed, deleted, unknown = repo.changes()

1434

modified, added, removed, deleted, unknown = repo.changes()

1433

output = ["%s%s" %

1435

output = ["%s%s" %

1434

('+'.join([hexfunc(parent) for parent in parents]),

1436

('+'.join([hexfunc(parent) for parent in parents]),

1435

(modified or added or removed or deleted) and "+" or "")]

1437

(modified or added or removed or deleted) and "+" or "")]

1436

1438

1437

if not ui.quiet:

1439

if not ui.quiet:

1438

# multiple tags for a single parent separated by '/'

1440

# multiple tags for a single parent separated by '/'

1439

parenttags = ['/'.join(tags)

1441

parenttags = ['/'.join(tags)

1440

for tags in map(repo.nodetags, parents) if tags]

1442

for tags in map(repo.nodetags, parents) if tags]

1441

# tags for multiple parents separated by ' + '

1443

# tags for multiple parents separated by ' + '

1442

if parenttags:

1444

if parenttags:

1443

output.append(' + '.join(parenttags))

1445

output.append(' + '.join(parenttags))

1444

1446

1445

ui.write("%s\n" % ' '.join(output))

1447

ui.write("%s\n" % ' '.join(output))

1446

1448

1447

def import_(ui, repo, patch1, *patches, **opts):

1449

def import_(ui, repo, patch1, *patches, **opts):

1448

"""import an ordered set of patches

1450

"""import an ordered set of patches

1449

1451

1450

Import a list of patches and commit them individually.

1452

Import a list of patches and commit them individually.

1451

1453

1452

If there are outstanding changes in the working directory, import

1454

If there are outstanding changes in the working directory, import

1453

will abort unless given the -f flag.

1455

will abort unless given the -f flag.

1454

1456

1455

If a patch looks like a mail message (its first line starts with

1457

If a patch looks like a mail message (its first line starts with

1456

"From " or looks like an RFC822 header), it will not be applied

1458

"From " or looks like an RFC822 header), it will not be applied

1457

unless the -f option is used. The importer neither parses nor

1459

unless the -f option is used. The importer neither parses nor

1458

discards mail headers, so use -f only to override the "mailness"

1460

discards mail headers, so use -f only to override the "mailness"

1459

safety check, not to import a real mail message.

1461

safety check, not to import a real mail message.

1460

"""

1462

"""

1461

patches = (patch1,) + patches

1463

patches = (patch1,) + patches

1462

1464

1463

if not opts['force']:

1465

if not opts['force']:

1464

modified, added, removed, deleted, unknown = repo.changes()

1466

modified, added, removed, deleted, unknown = repo.changes()

1465

if modified or added or removed or deleted:

1467

if modified or added or removed or deleted:

1466

raise util.Abort(_("outstanding uncommitted changes"))

1468

raise util.Abort(_("outstanding uncommitted changes"))

1467

1469

1468

d = opts["base"]

1470

d = opts["base"]

1469

strip = opts["strip"]

1471

strip = opts["strip"]

1470

1472

1471

mailre = re.compile(r'(?:From |[\w-]+:)')

1473

mailre = re.compile(r'(?:From |[\w-]+:)')

1472

1474

1473

# attempt to detect the start of a patch

1475

# attempt to detect the start of a patch

1474

# (this heuristic is borrowed from quilt)

1476

# (this heuristic is borrowed from quilt)

1475

diffre = re.compile(r'(?:Index:[ \t]|diff[ \t]|RCS file: |' +

1477

diffre = re.compile(r'(?:Index:[ \t]|diff[ \t]|RCS file: |' +

1476

'retrieving revision [0-9]+(\.[0-9]+)*$|' +

1478

'retrieving revision [0-9]+(\.[0-9]+)*$|' +

1477

'(---|\*\*\*)[ \t])')

1479

'(---|\*\*\*)[ \t])')

1478

1480

1479

for patch in patches:

1481

for patch in patches:

1480

ui.status(_("applying %s\n") % patch)

1482

ui.status(_("applying %s\n") % patch)

1481

pf = os.path.join(d, patch)

1483

pf = os.path.join(d, patch)

1482

1484

1483

message = []

1485

message = []

1484

user = None

1486

user = None

1485

hgpatch = False

1487

hgpatch = False

1486

for line in file(pf):

1488

for line in file(pf):

1487

line = line.rstrip()

1489

line = line.rstrip()

1488

if (not message and not hgpatch and

1490

if (not message and not hgpatch and

1489

mailre.match(line) and not opts['force']):

1491

mailre.match(line) and not opts['force']):

1490

if len(line) > 35:

1492

if len(line) > 35:

1491

line = line[:32] + '...'

1493

line = line[:32] + '...'

1492

raise util.Abort(_('first line looks like a '

1494

raise util.Abort(_('first line looks like a '

1493

'mail header: ') + line)

1495

'mail header: ') + line)

1494

if diffre.match(line):

1496

if diffre.match(line):

1495

break

1497

break

1496

elif hgpatch:

1498

elif hgpatch:

1497

# parse values when importing the result of an hg export

1499

# parse values when importing the result of an hg export

1498

if line.startswith("# User "):

1500

if line.startswith("# User "):

1499

user = line[7:]

1501

user = line[7:]

1500

ui.debug(_('User: %s\n') % user)

1502

ui.debug(_('User: %s\n') % user)

1501

elif not line.startswith("# ") and line:

1503

elif not line.startswith("# ") and line:

1502

message.append(line)

1504

message.append(line)

1503

hgpatch = False

1505

hgpatch = False

1504

elif line == '# HG changeset patch':

1506

elif line == '# HG changeset patch':

1505

hgpatch = True

1507

hgpatch = True

1506

message = [] # We may have collected garbage

1508

message = [] # We may have collected garbage

1507

else:

1509

else:

1508

message.append(line)

1510

message.append(line)

1509

1511

1510

# make sure message isn't empty

1512

# make sure message isn't empty

1511

if not message:

1513

if not message:

1512

message = _("imported patch %s\n") % patch

1514

message = _("imported patch %s\n") % patch

1513

else:

1515

else:

1514

message = "%s\n" % '\n'.join(message)

1516

message = "%s\n" % '\n'.join(message)

1515

ui.debug(_('message:\n%s\n') % message)

1517

ui.debug(_('message:\n%s\n') % message)

1516

1518

1517

files = util.patch(strip, pf, ui)

1519

files = util.patch(strip, pf, ui)

1518

1520

1519

if len(files) > 0:

1521

if len(files) > 0:

1520

addremove(ui, repo, *files)

1522

addremove(ui, repo, *files)

1521

repo.commit(files, message, user)

1523

repo.commit(files, message, user)

1522

1524

1523

def incoming(ui, repo, source="default", **opts):

1525

def incoming(ui, repo, source="default", **opts):

1524

"""show new changesets found in source

1526

"""show new changesets found in source

1525

1527

1526

Show new changesets found in the specified repo or the default

1528

Show new changesets found in the specified repo or the default

1527

pull repo. These are the changesets that would be pulled if a pull

1529

pull repo. These are the changesets that would be pulled if a pull

1528

was requested.

1530

was requested.

1529

1531

1530

Currently only local repositories are supported.

1532

Currently only local repositories are supported.

1531

"""

1533

"""

1532

source = ui.expandpath(source, repo.root)

1534

source = ui.expandpath(source, repo.root)

1533

other = hg.repository(ui, source)

1535

other = hg.repository(ui, source)

1534

if not other.local():

1536

if not other.local():

1535

raise util.Abort(_("incoming doesn't work for remote repositories yet"))

1537

raise util.Abort(_("incoming doesn't work for remote repositories yet"))

1536

o = repo.findincoming(other)

1538

o = repo.findincoming(other)

1537

if not o:

1539

if not o:

1538

return

1540

return

1539

o = other.changelog.nodesbetween(o)[0]

1541

o = other.changelog.nodesbetween(o)[0]

1540

if opts['newest_first']:

1542

if opts['newest_first']:

1541

o.reverse()

1543

o.reverse()

1542

for n in o:

1544

for n in o:

1543

parents = [p for p in other.changelog.parents(n) if p != nullid]

1545

parents = [p for p in other.changelog.parents(n) if p != nullid]

1544

if opts['no_merges'] and len(parents) == 2:

1546

if opts['no_merges'] and len(parents) == 2:

1545

continue

1547

continue

1546

show_changeset(ui, other, changenode=n)

1548

show_changeset(ui, other, changenode=n)

1547

if opts['patch']:

1549

if opts['patch']:

1548

prev = (parents and parents[0]) or nullid

1550

prev = (parents and parents[0]) or nullid

1549

dodiff(ui, ui, other, prev, n)

1551

dodiff(ui, ui, other, prev, n)

1550

ui.write("\n")

1552

ui.write("\n")

1551

1553

1552

def init(ui, dest="."):

1554

def init(ui, dest="."):

1553

"""create a new repository in the given directory

1555

"""create a new repository in the given directory

1554

1556

1555

Initialize a new repository in the given directory. If the given

1557

Initialize a new repository in the given directory. If the given

1556

directory does not exist, it is created.

1558

directory does not exist, it is created.

1557

1559

1558

If no directory is given, the current directory is used.

1560

If no directory is given, the current directory is used.

1559

"""

1561

"""

1560

if not os.path.exists(dest):

1562

if not os.path.exists(dest):

1561

os.mkdir(dest)

1563

os.mkdir(dest)

1562

hg.repository(ui, dest, create=1)

1564

hg.repository(ui, dest, create=1)

1563

1565

1564

def locate(ui, repo, *pats, **opts):

1566

def locate(ui, repo, *pats, **opts):

1565

"""locate files matching specific patterns

1567

"""locate files matching specific patterns

1566

1568

1567

Print all files under Mercurial control whose names match the

1569

Print all files under Mercurial control whose names match the

1568

given patterns.

1570

given patterns.

1569

1571

1570

This command searches the current directory and its

1572

This command searches the current directory and its

1571

subdirectories. To search an entire repository, move to the root

1573

subdirectories. To search an entire repository, move to the root

1572

of the repository.

1574

of the repository.

1573

1575

1574

If no patterns are given to match, this command prints all file

1576

If no patterns are given to match, this command prints all file

1575

names.

1577

names.

1576

1578

1577

If you want to feed the output of this command into the "xargs"

1579

If you want to feed the output of this command into the "xargs"

1578

command, use the "-0" option to both this command and "xargs".

1580

command, use the "-0" option to both this command and "xargs".

1579

This will avoid the problem of "xargs" treating single filenames

1581

This will avoid the problem of "xargs" treating single filenames

1580

that contain white space as multiple filenames.

1582

that contain white space as multiple filenames.

1581

"""

1583

"""

1582

end = opts['print0'] and '\0' or '\n'

1584

end = opts['print0'] and '\0' or '\n'

1583

rev = opts['rev']

1585

rev = opts['rev']

1584

if rev:

1586

if rev:

1585

node = repo.lookup(rev)

1587

node = repo.lookup(rev)

1586

else:

1588

else:

1587

node = None

1589

node = None

1588

1590

1589

for src, abs, rel, exact in walk(repo, pats, opts, node=node,

1591

for src, abs, rel, exact in walk(repo, pats, opts, node=node,

1590

head='(?:.*/|)'):

1592

head='(?:.*/|)'):

1591

if not node and repo.dirstate.state(abs) == '?':

1593

if not node and repo.dirstate.state(abs) == '?':

1592

continue

1594

continue

1593

if opts['fullpath']:

1595

if opts['fullpath']:

1594

ui.write(os.path.join(repo.root, abs), end)

1596

ui.write(os.path.join(repo.root, abs), end)

1595

else:

1597

else:

1596

ui.write(((pats and rel) or abs), end)

1598

ui.write(((pats and rel) or abs), end)

1597

1599

1598

def log(ui, repo, *pats, **opts):

1600

def log(ui, repo, *pats, **opts):

1599

"""show revision history of entire repository or files

1601

"""show revision history of entire repository or files

1600

1602

1601

Print the revision history of the specified files or the entire project.

1603

Print the revision history of the specified files or the entire project.

1602

1604

1603

By default this command outputs: changeset id and hash, tags,

1605

By default this command outputs: changeset id and hash, tags,

1604

non-trivial parents, user, date and time, and a summary for each

1606

non-trivial parents, user, date and time, and a summary for each

1605

commit. When the -v/--verbose switch is used, the list of changed

1607

commit. When the -v/--verbose switch is used, the list of changed

1606

files and full commit message is shown.

1608

files and full commit message is shown.

1607

"""

1609

"""

1608

class dui(object):

1610

class dui(object):

1609

# Implement and delegate some ui protocol. Save hunks of

1611

# Implement and delegate some ui protocol. Save hunks of

1610

# output for later display in the desired order.

1612

# output for later display in the desired order.

1611

def __init__(self, ui):

1613

def __init__(self, ui):

1612

self.ui = ui

1614

self.ui = ui

1613

self.hunk = {}

1615

self.hunk = {}

1614

def bump(self, rev):

1616

def bump(self, rev):

1615

self.rev = rev

1617

self.rev = rev

1616

self.hunk[rev] = []

1618

self.hunk[rev] = []

1617

def note(self, *args):

1619

def note(self, *args):

1618

if self.verbose:

1620

if self.verbose:

1619

self.write(*args)

1621

self.write(*args)

1620

def status(self, *args):

1622

def status(self, *args):

1621

if not self.quiet:

1623

if not self.quiet:

1622

self.write(*args)

1624

self.write(*args)

1623

def write(self, *args):

1625

def write(self, *args):

1624

self.hunk[self.rev].append(args)

1626

self.hunk[self.rev].append(args)

1625

def debug(self, *args):

1627

def debug(self, *args):

1626

if self.debugflag:

1628

if self.debugflag:

1627

self.write(*args)

1629

self.write(*args)

1628

def __getattr__(self, key):

1630

def __getattr__(self, key):

1629

return getattr(self.ui, key)

1631

return getattr(self.ui, key)

1630

1632

1631

changeiter, getchange, matchfn = walkchangerevs(ui, repo, pats, opts)

1633

changeiter, getchange, matchfn = walkchangerevs(ui, repo, pats, opts)

1632

1634

1633

if opts['limit']:

1635

if opts['limit']:

1634

try:

1636

try:

1635

limit = int(opts['limit'])

1637

limit = int(opts['limit'])

1636

except ValueError:

1638

except ValueError:

1637

raise util.Abort(_('limit must be a positive integer'))

1639

raise util.Abort(_('limit must be a positive integer'))

1638

if limit <= 0: raise util.Abort(_('limit must be positive'))

1640

if limit <= 0: raise util.Abort(_('limit must be positive'))

1639

else:

1641

else:

1640

limit = sys.maxint

1642

limit = sys.maxint

1641

count = 0

1643

count = 0

1642

1644

1643

for st, rev, fns in changeiter:

1645

for st, rev, fns in changeiter:

1644

if st == 'window':

1646

if st == 'window':

1645

du = dui(ui)

1647

du = dui(ui)

1646

elif st == 'add':

1648

elif st == 'add':

1647

du.bump(rev)

1649

du.bump(rev)

1648

changenode = repo.changelog.node(rev)

1650

changenode = repo.changelog.node(rev)

1649

parents = [p for p in repo.changelog.parents(changenode)

1651

parents = [p for p in repo.changelog.parents(changenode)

1650

if p != nullid]

1652

if p != nullid]

1651

if opts['no_merges'] and len(parents) == 2:

1653

if opts['no_merges'] and len(parents) == 2:

1652

continue

1654

continue

1653

if opts['only_merges'] and len(parents) != 2:

1655

if opts['only_merges'] and len(parents) != 2:

1654

continue

1656

continue

1655

1657

1656

if opts['keyword']:

1658

if opts['keyword']:

1657

changes = getchange(rev)

1659

changes = getchange(rev)

1658

miss = 0

1660

miss = 0

1659

for k in [kw.lower() for kw in opts['keyword']]:

1661

for k in [kw.lower() for kw in opts['keyword']]:

1660

if not (k in changes[1].lower() or

1662

if not (k in changes[1].lower() or

1661

k in changes[4].lower() or

1663

k in changes[4].lower() or

1662

k in " ".join(changes[3][:20]).lower()):

1664

k in " ".join(changes[3][:20]).lower()):

1663

miss = 1

1665

miss = 1

1664

break

1666

break

1665

if miss:

1667

if miss:

1666

continue

1668

continue

1667

1669

1668

br = None

1670

br = None

1669

if opts['branches']:

1671

if opts['branches']:

1670

br = repo.branchlookup([repo.changelog.node(rev)])

1672

br = repo.branchlookup([repo.changelog.node(rev)])

1671

1673

1672

show_changeset(du, repo, rev, brinfo=br)

1674

show_changeset(du, repo, rev, brinfo=br)

1673

if opts['patch']:

1675

if opts['patch']:

1674

prev = (parents and parents[0]) or nullid

1676

prev = (parents and parents[0]) or nullid

1675

dodiff(du, du, repo, prev, changenode, match=matchfn)

1677

dodiff(du, du, repo, prev, changenode, match=matchfn)

1676

du.write("\n\n")

1678

du.write("\n\n")

1677

elif st == 'iter':

1679

elif st == 'iter':

1678

if count == limit: break

1680

if count == limit: break

1679

if du.hunk[rev]:

1681

if du.hunk[rev]:

1680

count += 1

1682

count += 1

1681

for args in du.hunk[rev]:

1683

for args in du.hunk[rev]:

1682

ui.write(*args)

1684

ui.write(*args)

1683

1685

1684

def manifest(ui, repo, rev=None):

1686

def manifest(ui, repo, rev=None):

1685

"""output the latest or given revision of the project manifest

1687

"""output the latest or given revision of the project manifest

1686

1688

1687

Print a list of version controlled files for the given revision.

1689

Print a list of version controlled files for the given revision.

1688

1690

1689

The manifest is the list of files being version controlled. If no revision

1691

The manifest is the list of files being version controlled. If no revision

1690

is given then the tip is used.

1692

is given then the tip is used.

1691

"""

1693

"""

1692

if rev:

1694

if rev:

1693

try:

1695

try:

1694

# assume all revision numbers are for changesets

1696

# assume all revision numbers are for changesets

1695

n = repo.lookup(rev)

1697

n = repo.lookup(rev)

1696

change = repo.changelog.read(n)

1698

change = repo.changelog.read(n)

1697

n = change[0]

1699

n = change[0]

1698

except hg.RepoError:

1700

except hg.RepoError:

1699

n = repo.manifest.lookup(rev)

1701

n = repo.manifest.lookup(rev)

1700

else:

1702

else:

1701

n = repo.manifest.tip()

1703

n = repo.manifest.tip()

1702

m = repo.manifest.read(n)

1704

m = repo.manifest.read(n)

1703

mf = repo.manifest.readflags(n)

1705

mf = repo.manifest.readflags(n)

1704

files = m.keys()

1706

files = m.keys()

1705

files.sort()

1707

files.sort()

1706

1708

1707

for f in files:

1709

for f in files:

1708

ui.write("%40s %3s %s\n" % (hex(m[f]), mf[f] and "755" or "644", f))

1710

ui.write("%40s %3s %s\n" % (hex(m[f]), mf[f] and "755" or "644", f))

1709

1711

1710

def outgoing(ui, repo, dest="default-push", **opts):

1712

def outgoing(ui, repo, dest="default-push", **opts):

1711

"""show changesets not found in destination

1713

"""show changesets not found in destination

1712

1714

1713

Show changesets not found in the specified destination repo or the

1715

Show changesets not found in the specified destination repo or the

1714

default push repo. These are the changesets that would be pushed

1716

default push repo. These are the changesets that would be pushed

1715

if a push was requested.

1717

if a push was requested.

1718

1719

See pull for valid source format details.

1716

"""

1720

"""

1717

dest = ui.expandpath(dest, repo.root)

1721

dest = ui.expandpath(dest, repo.root)

1718

other = hg.repository(ui, dest)

1722

other = hg.repository(ui, dest)

1719

o = repo.findoutgoing(other)

1723

o = repo.findoutgoing(other)

1720

o = repo.changelog.nodesbetween(o)[0]

1724

o = repo.changelog.nodesbetween(o)[0]

1721

if opts['newest_first']:

1725

if opts['newest_first']:

1722

o.reverse()

1726

o.reverse()

1723

for n in o:

1727

for n in o:

1724

parents = [p for p in repo.changelog.parents(n) if p != nullid]

1728

parents = [p for p in repo.changelog.parents(n) if p != nullid]

1725

if opts['no_merges'] and len(parents) == 2:

1729

if opts['no_merges'] and len(parents) == 2:

1726

continue

1730

continue

1727

show_changeset(ui, repo, changenode=n)

1731

show_changeset(ui, repo, changenode=n)

1728

if opts['patch']:

1732

if opts['patch']:

1729

prev = (parents and parents[0]) or nullid

1733

prev = (parents and parents[0]) or nullid

1730

dodiff(ui, ui, repo, prev, n)

1734

dodiff(ui, ui, repo, prev, n)

1731

ui.write("\n")

1735

ui.write("\n")

1732

1736

1733

def parents(ui, repo, rev=None, branches=None):

1737

def parents(ui, repo, rev=None, branches=None):

1734

"""show the parents of the working dir or revision

1738

"""show the parents of the working dir or revision

1735

1739

1736

Print the working directory's parent revisions.

1740

Print the working directory's parent revisions.

1737

"""

1741

"""

1738

if rev:

1742

if rev:

1739

p = repo.changelog.parents(repo.lookup(rev))

1743

p = repo.changelog.parents(repo.lookup(rev))

1740

else:

1744

else:

1741

p = repo.dirstate.parents()

1745

p = repo.dirstate.parents()

1742

1746

1743

br = None

1747

br = None

1744

if branches is not None:

1748

if branches is not None:

1745

br = repo.branchlookup(p)

1749

br = repo.branchlookup(p)

1746

for n in p:

1750

for n in p:

1747

if n != nullid:

1751

if n != nullid:

1748

show_changeset(ui, repo, changenode=n, brinfo=br)

1752

show_changeset(ui, repo, changenode=n, brinfo=br)

1749

1753

1750

def paths(ui, search=None):

1754

def paths(ui, search=None):

1751

"""show definition of symbolic path names

1755

"""show definition of symbolic path names

1752

1756

1753

Show definition of symbolic path name NAME. If no name is given, show

1757

Show definition of symbolic path name NAME. If no name is given, show

1754

definition of available names.

1758

definition of available names.

1755

1759

1756

Path names are defined in the [paths] section of /etc/mercurial/hgrc

1760

Path names are defined in the [paths] section of /etc/mercurial/hgrc

1757

and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.

1761

and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.

1758

"""

1762

"""

1759

try:

1763

try:

1760

repo = hg.repository(ui=ui)

1764

repo = hg.repository(ui=ui)

1761

except hg.RepoError:

1765

except hg.RepoError:

1762

pass

1766

pass

1763

1767

1764

if search:

1768

if search:

1765

for name, path in ui.configitems("paths"):

1769

for name, path in ui.configitems("paths"):

1766

if name == search:

1770

if name == search:

1767

ui.write("%s\n" % path)

1771

ui.write("%s\n" % path)

1768

return

1772

return

1769

ui.warn(_("not found!\n"))

1773

ui.warn(_("not found!\n"))

1770

return 1

1774

return 1

1771

else:

1775

else:

1772

for name, path in ui.configitems("paths"):

1776

for name, path in ui.configitems("paths"):

1773

ui.write("%s = %s\n" % (name, path))

1777

ui.write("%s = %s\n" % (name, path))

1774

1778

1775

def pull(ui, repo, source="default", **opts):

1779

def pull(ui, repo, source="default", **opts):

1776

"""pull changes from the specified source

1780

"""pull changes from the specified source

1777

1781

1778

Pull changes from a remote repository to a local one.

1782

Pull changes from a remote repository to a local one.

1779

1783

1780

This finds all changes from the repository at the specified path

1784

This finds all changes from the repository at the specified path

1781

or URL and adds them to the local repository. By default, this

1785

or URL and adds them to the local repository. By default, this

1782

does not update the copy of the project in the working directory.

1786

does not update the copy of the project in the working directory.

1783

1787

1784

Valid URLs are of the form:

1788

Valid URLs are of the form:

1785

1789

1786

local/filesystem/path

1790

local/filesystem/path

1787

http://[user@]host[:port][/path]

1791

http://[user@]host[:port][/path]

1788

https://[user@]host[:port][/path]

1792

https://[user@]host[:port][/path]

1789

ssh://[user@]host[:port][/path]

1793

ssh://[user@]host[:port][/path]

1790

1794

1791

SSH requires an accessible shell account on the destination machine

1795

SSH requires an accessible shell account on the destination machine

1792

and a copy of hg in the remote path. With SSH, paths are relative

1796

and a copy of hg in the remote path. With SSH, paths are relative

1793

to the remote user's home directory by default; use two slashes at

1797

to the remote user's home directory by default; use two slashes at

1794

the start of a path to specify it as relative to the filesystem root.

1798

the start of a path to specify it as relative to the filesystem root.

1795

"""

1799

"""

1796

source = ui.expandpath(source, repo.root)

1800

source = ui.expandpath(source, repo.root)

1797

ui.status(_('pulling from %s\n') % (source))

1801

ui.status(_('pulling from %s\n') % (source))

1798

1802

1799

if opts['ssh']:

1803

if opts['ssh']:

1800

ui.setconfig("ui", "ssh", opts['ssh'])

1804

ui.setconfig("ui", "ssh", opts['ssh'])

1801

if opts['remotecmd']:

1805

if opts['remotecmd']:

1802

ui.setconfig("ui", "remotecmd", opts['remotecmd'])

1806

ui.setconfig("ui", "remotecmd", opts['remotecmd'])

1803

1807

1804

other = hg.repository(ui, source)

1808

other = hg.repository(ui, source)

1805

revs = None

1809

revs = None

1806

if opts['rev'] and not other.local():

1810

if opts['rev'] and not other.local():

1807

raise util.Abort(_("pull -r doesn't work for remote repositories yet"))

1811

raise util.Abort(_("pull -r doesn't work for remote repositories yet"))

1808

elif opts['rev']:

1812

elif opts['rev']:

1809

revs = [other.lookup(rev) for rev in opts['rev']]

1813

revs = [other.lookup(rev) for rev in opts['rev']]

1810

r = repo.pull(other, heads=revs)

1814

r = repo.pull(other, heads=revs)

1811

if not r:

1815

if not r:

1812

if opts['update']:

1816

if opts['update']:

1813

return update(ui, repo)

1817

return update(ui, repo)

1814

else:

1818

else:

1815

ui.status(_("(run 'hg update' to get a working copy)\n"))

1819

ui.status(_("(run 'hg update' to get a working copy)\n"))

1816

1820

1817

return r

1821

return r

1818

1822

1819

def push(ui, repo, dest="default-push", **opts):

1823

def push(ui, repo, dest="default-push", **opts):

1820

"""push changes to the specified destination

1824

"""push changes to the specified destination

1821

1825

1822

Push changes from the local repository to the given destination.

1826

Push changes from the local repository to the given destination.

1823

1827

1824

This is the symmetrical operation for pull. It helps to move

1828

This is the symmetrical operation for pull. It helps to move

1825

changes from the current repository to a different one. If the

1829

changes from the current repository to a different one. If the

1826

destination is local this is identical to a pull in that directory

1830

destination is local this is identical to a pull in that directory

1827

from the current one.

1831

from the current one.

1828

1832

1829

By default, push will refuse to run if it detects the result would

1833

By default, push will refuse to run if it detects the result would

1830

increase the number of remote heads. This generally indicates the

1834

increase the number of remote heads. This generally indicates the

1831

the client has forgotten to sync and merge before pushing.

1835

the client has forgotten to sync and merge before pushing.

1832

1836

1833

Valid URLs are of the form:

1837

Valid URLs are of the form:

1834

1838

1835

local/filesystem/path

1839

local/filesystem/path

1836

ssh://[user@]host[:port][/path]

1840

ssh://[user@]host[:port][/path]

1837

1841

1838

SSH requires an accessible shell account on the destination

1842

SSH requires an accessible shell account on the destination

1839

machine and a copy of hg in the remote path.

1843

machine and a copy of hg in the remote path.

1840

"""

1844

"""

1841

dest = ui.expandpath(dest, repo.root)

1845

dest = ui.expandpath(dest, repo.root)

1842

ui.status('pushing to %s\n' % (dest))

1846

ui.status('pushing to %s\n' % (dest))

1843

1847

1844

if opts['ssh']:

1848

if opts['ssh']:

1845

ui.setconfig("ui", "ssh", opts['ssh'])

1849

ui.setconfig("ui", "ssh", opts['ssh'])

1846

if opts['remotecmd']:

1850

if opts['remotecmd']:

1847

ui.setconfig("ui", "remotecmd", opts['remotecmd'])

1851

ui.setconfig("ui", "remotecmd", opts['remotecmd'])

1848

1852

1849

other = hg.repository(ui, dest)

1853

other = hg.repository(ui, dest)

1850

revs = None

1854

revs = None

1851

if opts['rev']:

1855

if opts['rev']:

1852

revs = [repo.lookup(rev) for rev in opts['rev']]

1856

revs = [repo.lookup(rev) for rev in opts['rev']]

1853

r = repo.push(other, opts['force'], revs=revs)

1857

r = repo.push(other, opts['force'], revs=revs)

1854

return r

1858

return r

1855

1859

1856

def rawcommit(ui, repo, *flist, **rc):

1860

def rawcommit(ui, repo, *flist, **rc):

1857

"""raw commit interface ~~(DEPRECATED)~~

1861

"""raw commit interface

1858

1862

1863

(DEPRECATED)

1859

Lowlevel commit, for use in helper scripts.

1864

Lowlevel commit, for use in helper scripts.

1860

1865

1861

This command is not intended to be used by normal users, as it is

1866

This command is not intended to be used by normal users, as it is

1862

primarily useful for importing from other SCMs.

1867

primarily useful for importing from other SCMs.

1863

1868

1864

This command is now deprecated and will be removed in a future

1869

This command is now deprecated and will be removed in a future

1865

release, please use debugsetparents and commit instead.

1870

release, please use debugsetparents and commit instead.

1866

"""

1871

"""

1867

1872

1868

ui.warn(_("(the rawcommit command is deprecated)\n"))

1873

ui.warn(_("(the rawcommit command is deprecated)\n"))

1869

1874

1870

message = rc['message']

1875

message = rc['message']

1871

if not message and rc['logfile']:

1876

if not message and rc['logfile']:

1872

try:

1877

try:

1873

message = open(rc['logfile']).read()

1878

message = open(rc['logfile']).read()

1874

except IOError:

1879

except IOError:

1875

pass

1880

pass

1876

if not message and not rc['logfile']:

1881

if not message and not rc['logfile']:

1877

raise util.Abort(_("missing commit message"))

1882

raise util.Abort(_("missing commit message"))

1878

1883

1879

files = relpath(repo, list(flist))

1884

files = relpath(repo, list(flist))

1880

if rc['files']:

1885

if rc['files']:

1881

files += open(rc['files']).read().splitlines()

1886

files += open(rc['files']).read().splitlines()

1882

1887

1883

rc['parent'] = map(repo.lookup, rc['parent'])

1888

rc['parent'] = map(repo.lookup, rc['parent'])

1884

1889

1885

try:

1890

try:

1886

repo.rawcommit(files, message, rc['user'], rc['date'], *rc['parent'])

1891

repo.rawcommit(files, message, rc['user'], rc['date'], *rc['parent'])

1887

except ValueError, inst:

1892

except ValueError, inst:

1888

raise util.Abort(str(inst))

1893

raise util.Abort(str(inst))

1889

1894

1890

def recover(ui, repo):

1895

def recover(ui, repo):

1891

"""roll back an interrupted transaction

1896

"""roll back an interrupted transaction

1892

1897

1893

Recover from an interrupted commit or pull.

1898

Recover from an interrupted commit or pull.

1894

1899

1895

This command tries to fix the repository status after an interrupted

1900

This command tries to fix the repository status after an interrupted

1896

operation. It should only be necessary when Mercurial suggests it.

1901

operation. It should only be necessary when Mercurial suggests it.

1897

"""

1902

"""

1898

if repo.recover():

1903

if repo.recover():

1899

return repo.verify()

1904

return repo.verify()

1900

return False

1905

return False

1901

1906

1902

def remove(ui, repo, pat, *pats, **opts):

1907

def remove(ui, repo, pat, *pats, **opts):

1903

"""remove the specified files on the next commit

1908

"""remove the specified files on the next commit

1904

1909

1905

Schedule the indicated files for removal from the repository.

1910

Schedule the indicated files for removal from the repository.

1906

1911

1907

This command schedules the files to be removed at the next commit.

1912

This command schedules the files to be removed at the next commit.

1908

This only removes files from the current branch, not from the

1913

This only removes files from the current branch, not from the

1909

entire project history. If the files still exist in the working

1914

entire project history. If the files still exist in the working

1910

directory, they will be deleted from it.

1915

directory, they will be deleted from it.

1911

"""

1916

"""

1912

names = []

1917

names = []

1913

def okaytoremove(abs, rel, exact):

1918

def okaytoremove(abs, rel, exact):

1914

modified, added, removed, deleted, unknown = repo.changes(files=[abs])

1919

modified, added, removed, deleted, unknown = repo.changes(files=[abs])

1915

reason = None

1920

reason = None

1916

if modified:

1921

if modified:

1917

reason = _('is modified')

1922

reason = _('is modified')

1918

elif added:

1923

elif added:

1919

reason = _('has been marked for add')

1924

reason = _('has been marked for add')

1920

elif unknown:

1925

elif unknown:

1921

reason = _('is not managed')

1926

reason = _('is not managed')

1922

if reason:

1927

if reason:

1923

if exact:

1928

if exact:

1924

ui.warn(_('not removing %s: file %s\n') % (rel, reason))

1929

ui.warn(_('not removing %s: file %s\n') % (rel, reason))

1925

else:

1930

else:

1926

return True

1931

return True

1927

for src, abs, rel, exact in walk(repo, (pat,) + pats, opts):

1932

for src, abs, rel, exact in walk(repo, (pat,) + pats, opts):

1928

if okaytoremove(abs, rel, exact):

1933

if okaytoremove(abs, rel, exact):

1929

if ui.verbose or not exact:

1934

if ui.verbose or not exact:

1930

ui.status(_('removing %s\n') % rel)

1935

ui.status(_('removing %s\n') % rel)

1931

names.append(abs)

1936

names.append(abs)

1932

repo.remove(names, unlink=True)

1937

repo.remove(names, unlink=True)

1933

1938

1934

def rename(ui, repo, *pats, **opts):

1939

def rename(ui, repo, *pats, **opts):

1935

"""rename files; equivalent of copy + remove

1940

"""rename files; equivalent of copy + remove

1936

1941

1937

Mark dest as copies of sources; mark sources for deletion. If

1942

Mark dest as copies of sources; mark sources for deletion. If

1938

dest is a directory, copies are put in that directory. If dest is

1943

dest is a directory, copies are put in that directory. If dest is

1939

a file, there can only be one source.

1944

a file, there can only be one source.

1940

1945

1941

By default, this command copies the contents of files as they

1946

By default, this command copies the contents of files as they

1942

stand in the working directory. If invoked with --after, the

1947

stand in the working directory. If invoked with --after, the

1943

operation is recorded, but no copying is performed.

1948

operation is recorded, but no copying is performed.

1944

1949

1945

This command takes effect in the next commit.

1950

This command takes effect in the next commit.

1946

1951

1947

NOTE: This command should be treated as experimental. While it

1952

NOTE: This command should be treated as experimental. While it

1948

should properly record rename files, this information is not yet

1953

should properly record rename files, this information is not yet

1949

fully used by merge, nor fully reported by log.

1954

fully used by merge, nor fully reported by log.

1950

"""

1955

"""

1951

errs, copied = docopy(ui, repo, pats, opts)

1956

errs, copied = docopy(ui, repo, pats, opts)

1952

names = []

1957

names = []

1953

for abs, rel, exact in copied:

1958

for abs, rel, exact in copied:

1954

if ui.verbose or not exact:

1959

if ui.verbose or not exact:

1955

ui.status(_('removing %s\n') % rel)

1960

ui.status(_('removing %s\n') % rel)

1956

names.append(abs)

1961

names.append(abs)

1957

repo.remove(names, unlink=True)

1962

repo.remove(names, unlink=True)

1958

return errs

1963

return errs

1959

1964

1960

def revert(ui, repo, *pats, **opts):

1965

def revert(ui, repo, *pats, **opts):

1961

"""revert modified files or dirs back to their unmodified states

1966

"""revert modified files or dirs back to their unmodified states

1962

1967

1963

~~Revert~~ any uncommitted modifications made ~~to the named files or~~

1968

In its default mode, it reverts any uncommitted modifications made

1964

directories. This restores the contents of ~~the affected files to~~

1969

to the named files or directories. This restores the contents of

1965

an unmodified state.

1970

the affected files to an unmodified state.

1971

1972

Using the -r option, it reverts the given files or directories to

1973

their state as of an earlier revision. This can be helpful to "roll

1974

back" some or all of a change that should not have been committed.

1975

1976

Revert modifies the working directory. It does not commit any

1977

changes, or change the parent of the current working directory.

1966

1978

1967

If a file has been deleted, it is recreated. If the executable

1979

If a file has been deleted, it is recreated. If the executable

1968

mode of a file was changed, it is reset.

1980

mode of a file was changed, it is reset.

1969

1981

1970

If names are given, all files matching the names are reverted.

1982

If names are given, all files matching the names are reverted.

1971

1983

1972

If no arguments are given, all files in the repository are reverted.

1984

If no arguments are given, all files in the repository are reverted.

1973

"""

1985

"""

1974

node = opts['rev'] and repo.lookup(opts['rev']) or \

1986

node = opts['rev'] and repo.lookup(opts['rev']) or \

1975

repo.dirstate.parents()[0]

1987

repo.dirstate.parents()[0]

1976

1988

1977

files, choose, anypats = matchpats(repo, pats, opts)

1989

files, choose, anypats = matchpats(repo, pats, opts)

1978

modified, added, removed, deleted, unknown = repo.changes(match=choose)

1990

modified, added, removed, deleted, unknown = repo.changes(match=choose)

1979

repo.forget(added)

1991

repo.forget(added)

1980

repo.undelete(removed)

1992

repo.undelete(removed)

1981

1993

1982

return repo.update(node, False, True, choose, False)

1994

return repo.update(node, False, True, choose, False)

1983

1995

1984

def root(ui, repo):

1996

def root(ui, repo):

1985

"""print the root (top) of the current working dir

1997

"""print the root (top) of the current working dir

1986

1998

1987

Print the root directory of the current repository.

1999

Print the root directory of the current repository.

1988

"""

2000

"""

1989

ui.write(repo.root + "\n")

2001

ui.write(repo.root + "\n")

1990

2002

1991

def serve(ui, repo, **opts):

2003

def serve(ui, repo, **opts):

1992

"""export the repository via HTTP

2004

"""export the repository via HTTP

1993

2005

1994

Start a local HTTP repository browser and pull server.

2006

Start a local HTTP repository browser and pull server.

1995

2007

1996

By default, the server logs accesses to stdout and errors to

2008

By default, the server logs accesses to stdout and errors to

1997

stderr. Use the "-A" and "-E" options to log to files.

2009

stderr. Use the "-A" and "-E" options to log to files.

1998

"""

2010

"""

1999

2011

2000

if opts["stdio"]:

2012

if opts["stdio"]:

2001

fin, fout = sys.stdin, sys.stdout

2013

fin, fout = sys.stdin, sys.stdout

2002

sys.stdout = sys.stderr

2014

sys.stdout = sys.stderr

2003

2015

2004

# Prevent insertion/deletion of CRs

2016

# Prevent insertion/deletion of CRs

2005

util.set_binary(fin)

2017

util.set_binary(fin)

2006

util.set_binary(fout)

2018

util.set_binary(fout)

2007

2019

2008

def getarg():

2020

def getarg():

2009

argline = fin.readline()[:-1]

2021

argline = fin.readline()[:-1]

2010

arg, l = argline.split()

2022

arg, l = argline.split()

2011

val = fin.read(int(l))

2023

val = fin.read(int(l))

2012

return arg, val

2024

return arg, val

2013

def respond(v):

2025

def respond(v):

2014

fout.write("%d\n" % len(v))

2026

fout.write("%d\n" % len(v))

2015

fout.write(v)

2027

fout.write(v)

2016

fout.flush()

2028

fout.flush()

2017

2029

2018

lock = None

2030

lock = None

2019

2031

2020

while 1:

2032

while 1:

2021

cmd = fin.readline()[:-1]

2033

cmd = fin.readline()[:-1]

2022

if cmd == '':

2034

if cmd == '':

2023

return

2035

return

2024

if cmd == "heads":

2036

if cmd == "heads":

2025

h = repo.heads()

2037

h = repo.heads()

2026

respond(" ".join(map(hex, h)) + "\n")

2038

respond(" ".join(map(hex, h)) + "\n")

2027

if cmd == "lock":

2039

if cmd == "lock":

2028

lock = repo.lock()

2040

lock = repo.lock()

2029

respond("")

2041

respond("")

2030

if cmd == "unlock":

2042

if cmd == "unlock":

2031

if lock:

2043

if lock:

2032

lock.release()

2044

lock.release()

2033

lock = None

2045

lock = None

2034

respond("")

2046

respond("")

2035

elif cmd == "branches":

2047

elif cmd == "branches":

2036

arg, nodes = getarg()

2048

arg, nodes = getarg()

2037

nodes = map(bin, nodes.split(" "))

2049

nodes = map(bin, nodes.split(" "))

2038

r = []

2050

r = []

2039

for b in repo.branches(nodes):

2051

for b in repo.branches(nodes):

2040

r.append(" ".join(map(hex, b)) + "\n")

2052

r.append(" ".join(map(hex, b)) + "\n")

2041

respond("".join(r))

2053

respond("".join(r))

2042

elif cmd == "between":

2054

elif cmd == "between":

2043

arg, pairs = getarg()

2055

arg, pairs = getarg()

2044

pairs = [map(bin, p.split("-")) for p in pairs.split(" ")]

2056

pairs = [map(bin, p.split("-")) for p in pairs.split(" ")]

2045

r = []

2057

r = []

2046

for b in repo.between(pairs):

2058

for b in repo.between(pairs):

2047

r.append(" ".join(map(hex, b)) + "\n")

2059

r.append(" ".join(map(hex, b)) + "\n")

2048

respond("".join(r))

2060

respond("".join(r))

2049

elif cmd == "changegroup":

2061

elif cmd == "changegroup":

2050

nodes = []

2062

nodes = []

2051

arg, roots = getarg()

2063

arg, roots = getarg()

2052

nodes = map(bin, roots.split(" "))

2064

nodes = map(bin, roots.split(" "))

2053

2065

2054

cg = repo.changegroup(nodes, 'serve')

2066

cg = repo.changegroup(nodes, 'serve')

2055

while 1:

2067

while 1:

2056

d = cg.read(4096)

2068

d = cg.read(4096)

2057

if not d:

2069

if not d:

2058

break

2070

break

2059

fout.write(d)

2071

fout.write(d)

2060

2072

2061

fout.flush()

2073

fout.flush()

2062

2074

2063

elif cmd == "addchangegroup":

2075

elif cmd == "addchangegroup":

2064

if not lock:

2076

if not lock:

2065

respond("not locked")

2077

respond("not locked")

2066

continue

2078

continue

2067

respond("")

2079

respond("")

2068

2080

2069

r = repo.addchangegroup(fin)

2081

r = repo.addchangegroup(fin)

2070

respond("")

2082

respond("")

2071

2083

2072

optlist = "name templates style address port ipv6 accesslog errorlog"

2084

optlist = "name templates style address port ipv6 accesslog errorlog"

2073

for o in optlist.split():

2085

for o in optlist.split():

2074

if opts[o]:

2086

if opts[o]:

2075

ui.setconfig("web", o, opts[o])

2087

ui.setconfig("web", o, opts[o])

2076

2088

2077

if opts['daemon'] and not opts['daemon_pipefds']:

2089

if opts['daemon'] and not opts['daemon_pipefds']:

2078

rfd, wfd = os.pipe()

2090

rfd, wfd = os.pipe()

2079

args = sys.argv[:]

2091

args = sys.argv[:]

2080

args.append('--daemon-pipefds=%d,%d' % (rfd, wfd))

2092

args.append('--daemon-pipefds=%d,%d' % (rfd, wfd))

2081

pid = os.spawnvp(os.P_NOWAIT | getattr(os, 'P_DETACH', 0),

2093

pid = os.spawnvp(os.P_NOWAIT | getattr(os, 'P_DETACH', 0),

2082

args[0], args)

2094

args[0], args)

2083

os.close(wfd)

2095

os.close(wfd)

2084

os.read(rfd, 1)

2096

os.read(rfd, 1)

2085

os._exit(0)

2097

os._exit(0)

2086

2098

2087

try:

2099

try:

2088

httpd = hgweb.create_server(repo)

2100

httpd = hgweb.create_server(repo)

2089

except socket.error, inst:

2101

except socket.error, inst:

2090

raise util.Abort(_('cannot start server: ') + inst.args[1])

2102

raise util.Abort(_('cannot start server: ') + inst.args[1])

2091

2103

2092

if ui.verbose:

2104

if ui.verbose:

2093

addr, port = httpd.socket.getsockname()

2105

addr, port = httpd.socket.getsockname()

2094

if addr == '0.0.0.0':

2106

if addr == '0.0.0.0':

2095

addr = socket.gethostname()

2107

addr = socket.gethostname()

2096

else:

2108

else:

2097

try:

2109

try:

2098

addr = socket.gethostbyaddr(addr)[0]

2110

addr = socket.gethostbyaddr(addr)[0]

2099

except socket.error:

2111

except socket.error:

2100

pass

2112

pass

2101

if port != 80:

2113

if port != 80:

2102

ui.status(_('listening at http://%s:%d/\n') % (addr, port))

2114

ui.status(_('listening at http://%s:%d/\n') % (addr, port))

2103

else:

2115

else:

2104

ui.status(_('listening at http://%s/\n') % addr)

2116

ui.status(_('listening at http://%s/\n') % addr)

2105

2117

2106

if opts['pid_file']:

2118

if opts['pid_file']:

2107

fp = open(opts['pid_file'], 'w')

2119

fp = open(opts['pid_file'], 'w')

2108

fp.write(str(os.getpid()))

2120

fp.write(str(os.getpid()))

2109

fp.close()

2121

fp.close()

2110

2122

2111

if opts['daemon_pipefds']:

2123

if opts['daemon_pipefds']:

2112

rfd, wfd = [int(x) for x in opts['daemon_pipefds'].split(',')]

2124

rfd, wfd = [int(x) for x in opts['daemon_pipefds'].split(',')]

2113

os.close(rfd)

2125

os.close(rfd)

2114

os.write(wfd, 'y')

2126

os.write(wfd, 'y')

2115

os.close(wfd)

2127

os.close(wfd)

2116

sys.stdout.flush()

2128

sys.stdout.flush()

2117

sys.stderr.flush()

2129

sys.stderr.flush()

2118

fd = os.open(util.nulldev, os.O_RDWR)

2130

fd = os.open(util.nulldev, os.O_RDWR)

2119

if fd != 0: os.dup2(fd, 0)

2131

if fd != 0: os.dup2(fd, 0)

2120

if fd != 1: os.dup2(fd, 1)

2132

if fd != 1: os.dup2(fd, 1)

2121

if fd != 2: os.dup2(fd, 2)

2133

if fd != 2: os.dup2(fd, 2)

2122

if fd not in (0, 1, 2): os.close(fd)

2134

if fd not in (0, 1, 2): os.close(fd)

2123

2135

2124

httpd.serve_forever()

2136

httpd.serve_forever()

2125

2137

2126

def status(ui, repo, *pats, **opts):

2138

def status(ui, repo, *pats, **opts):

2127

"""show changed files in the working directory

2139

"""show changed files in the working directory

2128

2140

2129

Show changed files in the repository. If names are

2141

Show changed files in the repository. If names are

2130

given, only files that match are shown.

2142

given, only files that match are shown.

2131

2143

2132

The codes used to show the status of files are:

2144

The codes used to show the status of files are:

2133

M = modified

2145

M = modified

2134

A = added

2146

A = added

2135

R = removed

2147

R = removed

2136

! = deleted, but still tracked

2148

! = deleted, but still tracked

2137

? = not tracked

2149

? = not tracked

2138

"""

2150

"""

2139

2151

2140

files, matchfn, anypats = matchpats(repo, pats, opts)

2152

files, matchfn, anypats = matchpats(repo, pats, opts)

2141

cwd = (pats and repo.getcwd()) or ''

2153

cwd = (pats and repo.getcwd()) or ''

2142

modified, added, removed, deleted, unknown = [

2154

modified, added, removed, deleted, unknown = [

2143

[util.pathto(cwd, x) for x in n]

2155

[util.pathto(cwd, x) for x in n]

2144

for n in repo.changes(files=files, match=matchfn)]

2156

for n in repo.changes(files=files, match=matchfn)]

2145

2157

2146

changetypes = [(_('modified'), 'M', modified),

2158

changetypes = [(_('modified'), 'M', modified),

2147

(_('added'), 'A', added),

2159

(_('added'), 'A', added),

2148

(_('removed'), 'R', removed),

2160

(_('removed'), 'R', removed),

2149

(_('deleted'), '!', deleted),

2161

(_('deleted'), '!', deleted),

2150

(_('unknown'), '?', unknown)]

2162

(_('unknown'), '?', unknown)]

2151

2163

2152

end = opts['print0'] and '\0' or '\n'

2164

end = opts['print0'] and '\0' or '\n'

2153

2165

2154

for opt, char, changes in ([ct for ct in changetypes if opts[ct[0]]]

2166

for opt, char, changes in ([ct for ct in changetypes if opts[ct[0]]]

2155

or changetypes):

2167

or changetypes):

2156

if opts['no_status']:

2168

if opts['no_status']:

2157

format = "%%s%s" % end

2169

format = "%%s%s" % end

2158

else:

2170

else:

2159

format = "%s %%s%s" % (char, end);

2171

format = "%s %%s%s" % (char, end);

2160

2172

2161

for f in changes:

2173

for f in changes:

2162

ui.write(format % f)

2174

ui.write(format % f)

2163

2175

2164

def tag(ui, repo, name, rev_=None, **opts):

2176

def tag(ui, repo, name, rev_=None, **opts):

2165

"""add a tag for the current tip or a given revision

2177

"""add a tag for the current tip or a given revision

2166

2178

2167

Name a particular revision using <name>.

2179

Name a particular revision using <name>.

2168

2180

2169

Tags are used to name particular revisions of the repository and are

2181

Tags are used to name particular revisions of the repository and are

2170

very useful to compare different revision, to go back to significant

2182

very useful to compare different revision, to go back to significant

2171

earlier versions or to mark branch points as releases, etc.

2183

earlier versions or to mark branch points as releases, etc.

2172

2184

2173

If no revision is given, the tip is used.

2185

If no revision is given, the tip is used.

2174

2186

2175

To facilitate version control, distribution, and merging of tags,

2187

To facilitate version control, distribution, and merging of tags,

2176

they are stored as a file named ".hgtags" which is managed

2188

they are stored as a file named ".hgtags" which is managed

2177

similarly to other project files and can be hand-edited if

2189

similarly to other project files and can be hand-edited if

2178

necessary. The file '.hg/localtags' is used for local tags (not

2190

necessary. The file '.hg/localtags' is used for local tags (not

2179

shared among repositories).

2191

shared among repositories).

2180

"""

2192

"""

2181

if name == "tip":

2193

if name == "tip":

2182

raise util.Abort(_("the name 'tip' is reserved"))

2194

raise util.Abort(_("the name 'tip' is reserved"))

2183

if rev_ is not None:

2195

if rev_ is not None:

2184

ui.warn(_("use of 'hg tag NAME [REV]' is deprecated, "

2196

ui.warn(_("use of 'hg tag NAME [REV]' is deprecated, "

2185

"please use 'hg tag [-r REV] NAME' instead\n"))

2197

"please use 'hg tag [-r REV] NAME' instead\n"))

2186

if opts['rev']:

2198

if opts['rev']:

2187

raise util.Abort(_("use only one form to specify the revision"))

2199

raise util.Abort(_("use only one form to specify the revision"))

2188

if opts['rev']:

2200

if opts['rev']:

2189

rev_ = opts['rev']

2201

rev_ = opts['rev']

2190

if rev_:

2202

if rev_:

2191

r = hex(repo.lookup(rev_))

2203

r = hex(repo.lookup(rev_))

2192

else:

2204

else:

2193

r = hex(repo.changelog.tip())

2205

r = hex(repo.changelog.tip())

2194

2206

2195

disallowed = (revrangesep, '\r', '\n')

2207

disallowed = (revrangesep, '\r', '\n')

2196

for c in disallowed:

2208

for c in disallowed:

2197

if name.find(c) >= 0:

2209

if name.find(c) >= 0:

2198

raise util.Abort(_("%s cannot be used in a tag name") % repr(c))

2210

raise util.Abort(_("%s cannot be used in a tag name") % repr(c))

2199

2211

2200

repo.hook('pretag', throw=True, node=r, tag=name,

2212

repo.hook('pretag', throw=True, node=r, tag=name,

2201

local=int(not not opts['local']))

2213

local=int(not not opts['local']))

2202

2214

2203

if opts['local']:

2215

if opts['local']:

2204

repo.opener("localtags", "a").write("%s %s\n" % (r, name))

2216

repo.opener("localtags", "a").write("%s %s\n" % (r, name))

2205

repo.hook('tag', node=r, tag=name, local=1)

2217

repo.hook('tag', node=r, tag=name, local=1)

2206

return

2218

return

2207

2219

2208

for x in repo.changes():

2220

for x in repo.changes():

2209

if ".hgtags" in x:

2221

if ".hgtags" in x:

2210

raise util.Abort(_("working copy of .hgtags is changed "

2222

raise util.Abort(_("working copy of .hgtags is changed "

2211

"(please commit .hgtags manually)"))

2223

"(please commit .hgtags manually)"))

2212

2224

2213

repo.wfile(".hgtags", "ab").write("%s %s\n" % (r, name))

2225

repo.wfile(".hgtags", "ab").write("%s %s\n" % (r, name))

2214

if repo.dirstate.state(".hgtags") == '?':

2226

if repo.dirstate.state(".hgtags") == '?':

2215

repo.add([".hgtags"])

2227

repo.add([".hgtags"])

2216

2228

2217

message = (opts['message'] or

2229

message = (opts['message'] or

2218

_("Added tag %s for changeset %s") % (name, r))

2230

_("Added tag %s for changeset %s") % (name, r))

2219

try:

2231

try:

2220

repo.commit([".hgtags"], message, opts['user'], opts['date'])

2232

repo.commit([".hgtags"], message, opts['user'], opts['date'])

2221

repo.hook('tag', node=r, tag=name, local=0)

2233

repo.hook('tag', node=r, tag=name, local=0)

2222

except ValueError, inst:

2234

except ValueError, inst:

2223

raise util.Abort(str(inst))

2235

raise util.Abort(str(inst))

2224

2236

2225

def tags(ui, repo):

2237

def tags(ui, repo):

2226

"""list repository tags

2238

"""list repository tags

2227

2239

2228

List the repository tags.

2240

List the repository tags.

2229

2241

2230

This lists both regular and local tags.

2242

This lists both regular and local tags.

2231

"""

2243

"""

2232

2244

2233

l = repo.tagslist()

2245

l = repo.tagslist()

2234

l.reverse()

2246

l.reverse()

2235

for t, n in l:

2247

for t, n in l:

2236

try:

2248

try:

2237

r = "%5d:%s" % (repo.changelog.rev(n), hex(n))

2249

r = "%5d:%s" % (repo.changelog.rev(n), hex(n))

2238

except KeyError:

2250

except KeyError:

2239

r = " ?:?"

2251

r = " ?:?"

2240

ui.write("%-30s %s\n" % (t, r))

2252

ui.write("%-30s %s\n" % (t, r))

2241

2253

2242

def tip(ui, repo, **opts):

2254

def tip(ui, repo, **opts):

2243

"""show the tip revision

2255

"""show the tip revision

2244

2256

2245

Show the tip revision.

2257

Show the tip revision.

2246

"""

2258

"""

2247

n = repo.changelog.tip()

2259

n = repo.changelog.tip()

2248

br = None

2260

br = None

2249

if opts['branches']:

2261

if opts['branches']:

2250

br = repo.branchlookup([n])

2262

br = repo.branchlookup([n])

2251

show_changeset(ui, repo, changenode=n, brinfo=br)

2263

show_changeset(ui, repo, changenode=n, brinfo=br)

2252

if opts['patch']:

2264

if opts['patch']:

2253

dodiff(ui, ui, repo, repo.changelog.parents(n)[0], n)

2265

dodiff(ui, ui, repo, repo.changelog.parents(n)[0], n)

2254

2266

2255

def unbundle(ui, repo, fname, **opts):

2267

def unbundle(ui, repo, fname, **opts):

2256

"""apply a changegroup file

2268

"""apply a changegroup file

2257

2269

2258

Apply a compressed changegroup file generated by the bundle

2270

Apply a compressed changegroup file generated by the bundle

2259

command.

2271

command.

2260

"""

2272

"""

2261

f = urllib.urlopen(fname)

2273

f = urllib.urlopen(fname)

2262

2274

2263

if f.read(4) != "HG10":

2275

if f.read(4) != "HG10":

2264

raise util.Abort(_("%s: not a Mercurial bundle file") % fname)

2276

raise util.Abort(_("%s: not a Mercurial bundle file") % fname)

2265

2277

2266

def bzgenerator(f):

2278

def bzgenerator(f):

2267

zd = bz2.BZ2Decompressor()

2279

zd = bz2.BZ2Decompressor()

2268

for chunk in f:

2280

for chunk in f:

2269

yield zd.decompress(chunk)

2281

yield zd.decompress(chunk)

2270

2282

2271

bzgen = bzgenerator(util.filechunkiter(f, 4096))

2283

bzgen = bzgenerator(util.filechunkiter(f, 4096))

2272

if repo.addchangegroup(util.chunkbuffer(bzgen)):

2284

if repo.addchangegroup(util.chunkbuffer(bzgen)):

2273

return 1

2285

return 1

2274

2286

2275

if opts['update']:

2287

if opts['update']:

2276

return update(ui, repo)

2288

return update(ui, repo)

2277

else:

2289

else:

2278

ui.status(_("(run 'hg update' to get a working copy)\n"))

2290

ui.status(_("(run 'hg update' to get a working copy)\n"))

2279

2291

2280

def undo(ui, repo):

2292

def undo(ui, repo):

2281

"""undo the last commit or pull

2293

"""undo the last commit or pull

2282

2294

2283

Roll back the last pull or commit transaction on the

2295

Roll back the last pull or commit transaction on the

2284

repository, restoring the project to its earlier state.

2296

repository, restoring the project to its earlier state.

2285

2297

2286

This command should be used with care. There is only one level of

2298

This command should be used with care. There is only one level of

2287

undo and there is no redo.

2299

undo and there is no redo.

2288

2300

2289

This command is not intended for use on public repositories. Once

2301

This command is not intended for use on public repositories. Once

2290

a change is visible for pull by other users, undoing it locally is

2302

a change is visible for pull by other users, undoing it locally is

2291

ineffective.

2303

ineffective.

2292

"""

2304

"""

2293

repo.undo()

2305

repo.undo()

2294

2306

2295

def update(ui, repo, node=None, merge=False, clean=False, force=None,

2307

def update(ui, repo, node=None, merge=False, clean=False, force=None,

2296

branch=None):

2308

branch=None):

2297

"""update or merge working directory

2309

"""update or merge working directory

2298

2310

2299

Update the working directory to the specified revision.

2311

Update the working directory to the specified revision.

2300

2312

2301

If there are no outstanding changes in the working directory and

2313

If there are no outstanding changes in the working directory and

2302

there is a linear relationship between the current version and the

2314

there is a linear relationship between the current version and the

2303

requested version, the result is the requested version.

2315

requested version, the result is the requested version.

2304

2316

2305

Otherwise the result is a merge between the contents of the

2317

Otherwise the result is a merge between the contents of the

2306

current working directory and the requested version. Files that

2318

current working directory and the requested version. Files that

2307

changed between either parent are marked as changed for the next

2319

changed between either parent are marked as changed for the next

2308

commit and a commit must be performed before any further updates

2320

commit and a commit must be performed before any further updates

2309

are allowed.

2321

are allowed.

2310

2322

2311

By default, update will refuse to run if doing so would require

2323

By default, update will refuse to run if doing so would require

2312

merging or discarding local changes.

2324

merging or discarding local changes.

2313

"""

2325

"""

2314

if branch:

2326

if branch:

2315

br = repo.branchlookup(branch=branch)

2327

br = repo.branchlookup(branch=branch)

2316

found = []

2328

found = []

2317

for x in br:

2329

for x in br:

2318

if branch in br[x]:

2330

if branch in br[x]:

2319

found.append(x)

2331

found.append(x)

2320

if len(found) > 1:

2332

if len(found) > 1:

2321

ui.warn(_("Found multiple heads for %s\n") % branch)

2333

ui.warn(_("Found multiple heads for %s\n") % branch)

2322

for x in found:

2334

for x in found:

2323

show_changeset(ui, repo, changenode=x, brinfo=br)

2335

show_changeset(ui, repo, changenode=x, brinfo=br)

2324

return 1

2336

return 1

2325

if len(found) == 1:

2337

if len(found) == 1:

2326

node = found[0]

2338

node = found[0]

2327

ui.warn(_("Using head %s for branch %s\n") % (short(node), branch))

2339

ui.warn(_("Using head %s for branch %s\n") % (short(node), branch))

2328

else:

2340

else:

2329

ui.warn(_("branch %s not found\n") % (branch))

2341

ui.warn(_("branch %s not found\n") % (branch))

2330

return 1

2342

return 1

2331

else:

2343

else:

2332

node = node and repo.lookup(node) or repo.changelog.tip()

2344

node = node and repo.lookup(node) or repo.changelog.tip()

2333

return repo.update(node, allow=merge, force=clean, forcemerge=force)

2345

return repo.update(node, allow=merge, force=clean, forcemerge=force)

2334

2346

2335

def verify(ui, repo):

2347

def verify(ui, repo):

2336

"""verify the integrity of the repository

2348

"""verify the integrity of the repository

2337

2349

2338

Verify the integrity of the current repository.

2350

Verify the integrity of the current repository.

2339

2351

2340

This will perform an extensive check of the repository's

2352

This will perform an extensive check of the repository's

2341

integrity, validating the hashes and checksums of each entry in

2353

integrity, validating the hashes and checksums of each entry in

2342

the changelog, manifest, and tracked files, as well as the

2354

the changelog, manifest, and tracked files, as well as the

2343

integrity of their crosslinks and indices.

2355

integrity of their crosslinks and indices.

2344

"""

2356

"""

2345

return repo.verify()

2357

return repo.verify()

2346

2358

2347

# Command options and aliases are listed here, alphabetically

2359

# Command options and aliases are listed here, alphabetically

2348

2360

2349

table = {

2361

table = {

2350

"^add":

2362

"^add":

2351

(add,

2363

(add,

2352

[('I', 'include', [], _('include names matching the given patterns')),

2364

[('I', 'include', [], _('include names matching the given patterns')),

2353

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2365

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2354

_('hg add [OPTION]... [FILE]...')),

2366

_('hg add [OPTION]... [FILE]...')),

2355

"addremove":

2367

"addremove":

2356

(addremove,

2368

(addremove,

2357

[('I', 'include', [], _('include names matching the given patterns')),

2369

[('I', 'include', [], _('include names matching the given patterns')),

2358

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2370

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2359

_('hg addremove [OPTION]... [FILE]...')),

2371

_('hg addremove [OPTION]... [FILE]...')),

2360

"^annotate":

2372

"^annotate":

2361

(annotate,

2373

(annotate,

2362

[('r', 'rev', '', _('annotate the specified revision')),

2374

[('r', 'rev', '', _('annotate the specified revision')),

2363

('a', 'text', None, _('treat all files as text')),

2375

('a', 'text', None, _('treat all files as text')),

2364

('u', 'user', None, _('list the author')),

2376

('u', 'user', None, _('list the author')),

2365

('d', 'date', None, _('list the date')),

2377

('d', 'date', None, _('list the date')),

2366

('n', 'number', None, _('list the revision number (default)')),

2378

('n', 'number', None, _('list the revision number (default)')),

2367

('c', 'changeset', None, _('list the changeset')),

2379

('c', 'changeset', None, _('list the changeset')),

2368

('I', 'include', [], _('include names matching the given patterns')),

2380

('I', 'include', [], _('include names matching the given patterns')),

2369

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2381

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2370

_('hg annotate [~~OPTION]... FILE...~~')),

2382

_('hg annotate [-r <rev> -u -n -c -d] [files ...]')),

2371

"bundle":

2383

"bundle":

2372

(bundle,

2384

(bundle,

2373

[],

2385

[],

2374

_('hg bundle FILE DEST')),

2386

_('hg bundle FILE DEST')),

2375

"cat":

2387

"cat":

2376

(cat,

2388

(cat,

2377

[('I', 'include', [], _('include names matching the given patterns')),

2389

[('I', 'include', [], _('include names matching the given patterns')),

2378

('X', 'exclude', [], _('exclude names matching the given patterns')),

2390

('X', 'exclude', [], _('exclude names matching the given patterns')),

2379

('o', 'output', '', _('print output to file with formatted name')),

2391

('o', 'output', '', _('print output to file with formatted name')),

2380

('r', 'rev', '', _('print the given revision'))],

2392

('r', 'rev', '', _('print the given revision'))],

2381

_('hg cat [OPTION]... FILE...')),

2393

_('hg cat [OPTION]... FILE...')),

2382

"^clone":

2394

"^clone":

2383

(clone,

2395

(clone,

2384

[('U', 'noupdate', None, _('do not update the new working directory')),

2396

[('U', 'noupdate', None, _('do not update the new working directory')),

2385

('e', 'ssh', '', _('specify ssh command to use')),

2397

('e', 'ssh', '', _('specify ssh command to use')),

2386

('', 'pull', None, _('use pull protocol to copy metadata')),

2398

('', 'pull', None, _('use pull protocol to copy metadata')),

2387

('r', 'rev', [],

2399

('r', 'rev', [],

2388

_('a changeset you would like to have after cloning')),

2400

_('a changeset you would like to have after cloning')),

2389

('', 'remotecmd', '',

2401

('', 'remotecmd', '',

2390

_('specify hg command to run on the remote side'))],

2402

_('specify hg command to run on the remote side'))],

2391

_('hg clone [OPTION]... SOURCE [DEST]')),

2403

_('hg clone [OPTION]... SOURCE [DEST]')),

2392

"^commit|ci":

2404

"^commit|ci":

2393

(commit,

2405

(commit,

2394

[('A', 'addremove', None, _('run addremove during commit')),

2406

[('A', 'addremove', None, _('run addremove during commit')),

2395

('I', 'include', [], _('include names matching the given patterns')),

2407

('I', 'include', [], _('include names matching the given patterns')),

2396

('X', 'exclude', [], _('exclude names matching the given patterns')),

2408

('X', 'exclude', [], _('exclude names matching the given patterns')),

2397

('m', 'message', '', _('use <text> as commit message')),

2409

('m', 'message', '', _('use <text> as commit message')),

2398

('l', 'logfile', '', _('read the commit message from <file>')),

2410

('l', 'logfile', '', _('read the commit message from <file>')),

2399

('d', 'date', '', _('record datecode as commit date')),

2411

('d', 'date', '', _('record datecode as commit date')),

2400

('u', 'user', '', _('record user as commiter'))],

2412

('u', 'user', '', _('record user as commiter'))],

2401

_('hg commit [OPTION]... [FILE]...')),

2413

_('hg commit [OPTION]... [FILE]...')),

2402

"copy|cp":

2414

"copy|cp":

2403

(copy,

2415

(copy,

2404

[('I', 'include', [], _('include names matching the given patterns')),

2416

[('I', 'include', [], _('include names matching the given patterns')),

2405

('X', 'exclude', [], _('exclude names matching the given patterns')),

2417

('X', 'exclude', [], _('exclude names matching the given patterns')),

2406

('A', 'after', None, _('record a copy that has already occurred')),

2418

('A', 'after', None, _('record a copy that has already occurred')),

2407

('f', 'force', None,

2419

('f', 'force', None,

2408

_('forcibly copy over an existing managed file'))],

2420

_('forcibly copy over an existing managed file'))],

2409

_('hg copy [OPTION]... [SOURCE]... DEST')),

2421

_('hg copy [OPTION]... [SOURCE]... DEST')),

2410

"debugancestor": (debugancestor, [], _('debugancestor INDEX REV1 REV2')),

2422

"debugancestor": (debugancestor, [], _('debugancestor INDEX REV1 REV2')),

2411

"debugrebuildstate":

2423

"debugrebuildstate":

2412

(debugrebuildstate,

2424

(debugrebuildstate,

2413

[('r', 'rev', "", _("revision to rebuild to"))],

2425

[('r', 'rev', "", _("revision to rebuild to"))],

2414

_('debugrebuildstate [-r REV] [REV]')),

2426

_('debugrebuildstate [-r REV] [REV]')),

2415

"debugcheckstate": (debugcheckstate, [], _('debugcheckstate')),

2427

"debugcheckstate": (debugcheckstate, [], _('debugcheckstate')),

2416

"debugconfig": (debugconfig, [], _('debugconfig')),

2428

"debugconfig": (debugconfig, [], _('debugconfig')),

2417

"debugsetparents": (debugsetparents, [], _('debugsetparents REV1 [REV2]')),

2429

"debugsetparents": (debugsetparents, [], _('debugsetparents REV1 [REV2]')),

2418

"debugstate": (debugstate, [], _('debugstate')),

2430

"debugstate": (debugstate, [], _('debugstate')),

2419

"debugdata": (debugdata, [], _('debugdata FILE REV')),

2431

"debugdata": (debugdata, [], _('debugdata FILE REV')),

2420

"debugindex": (debugindex, [], _('debugindex FILE')),

2432

"debugindex": (debugindex, [], _('debugindex FILE')),

2421

"debugindexdot": (debugindexdot, [], _('debugindexdot FILE')),

2433

"debugindexdot": (debugindexdot, [], _('debugindexdot FILE')),

2422

"debugrename": (debugrename, [], _('debugrename FILE [REV]')),

2434

"debugrename": (debugrename, [], _('debugrename FILE [REV]')),

2423

"debugwalk":

2435

"debugwalk":

2424

(debugwalk,

2436

(debugwalk,

2425

[('I', 'include', [], _('include names matching the given patterns')),

2437

[('I', 'include', [], _('include names matching the given patterns')),

2426

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2438

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2427

_('debugwalk [OPTION]... [FILE]...')),

2439

_('debugwalk [OPTION]... [FILE]...')),

2428

"^diff":

2440

"^diff":

2429

(diff,

2441

(diff,

2430

[('r', 'rev', [], _('revision')),

2442

[('r', 'rev', [], _('revision')),

2431

('a', 'text', None, _('treat all files as text')),

2443

('a', 'text', None, _('treat all files as text')),

2432

('I', 'include', [], _('include names matching the given patterns')),

2444

('I', 'include', [], _('include names matching the given patterns')),

2433

('p', 'show-function', None,

2445

('p', 'show-function', None,

2434

_('show which function each change is in')),

2446

_('show which function each change is in')),

2435

('w', 'ignore-all-space', None,

2447

('w', 'ignore-all-space', None,

2436

_('ignore white space when comparing lines')),

2448

_('ignore white space when comparing lines')),

2437

('X', 'exclude', [],

2449

('X', 'exclude', [],

2438

_('exclude names matching the given patterns'))],

2450

_('exclude names matching the given patterns'))],

2439

_('hg diff [-a] [-I] [-X] [-r REV1 [-r REV2]] [FILE]...')),

2451

_('hg diff [-a] [-I] [-X] [-r REV1 [-r REV2]] [FILE]...')),

2440

"^export":

2452

"^export":

2441

(export,

2453

(export,

2442

[('o', 'output', '', _('print output to file with formatted name')),

2454

[('o', 'output', '', _('print output to file with formatted name')),

2443

('a', 'text', None, _('treat all files as text')),

2455

('a', 'text', None, _('treat all files as text')),

2444

('', 'switch-parent', None, _('diff against the second parent'))],

2456

('', 'switch-parent', None, _('diff against the second parent'))],

2445

_('hg export [-a] [-o ~~OUTFILE~~] REV...')),

2457

_('hg export [-a] [-o filespec] REV...')),

2446

"forget":

2458

"forget":

2447

(forget,

2459

(forget,

2448

[('I', 'include', [], _('include names matching the given patterns')),

2460

[('I', 'include', [], _('include names matching the given patterns')),

2449

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2461

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2450

_('hg forget [OPTION]... FILE...')),

2462

_('hg forget [OPTION]... FILE...')),

2451

"grep":

2463

"grep":

2452

(grep,

2464

(grep,

2453

[('0', 'print0', None, _('end fields with NUL')),

2465

[('0', 'print0', None, _('end fields with NUL')),

2454

('I', 'include', [], _('include names matching the given patterns')),

2466

('I', 'include', [], _('include names matching the given patterns')),

2455

('X', 'exclude', [], _('exclude names matching the given patterns')),

2467

('X', 'exclude', [], _('exclude names matching the given patterns')),

2456

('', 'all', None, _('print all revisions that match')),

2468

('', 'all', None, _('print all revisions that match')),

2457

('i', 'ignore-case', None, _('ignore case when matching')),

2469

('i', 'ignore-case', None, _('ignore case when matching')),

2458

('l', 'files-with-matches', None,

2470

('l', 'files-with-matches', None,

2459

_('print only filenames and revs that match')),

2471

_('print only filenames and revs that match')),

2460

('n', 'line-number', None, _('print matching line numbers')),

2472

('n', 'line-number', None, _('print matching line numbers')),

2461

('r', 'rev', [], _('search in given revision range')),

2473

('r', 'rev', [], _('search in given revision range')),

2462

('u', 'user', None, _('print user who committed change'))],

2474

('u', 'user', None, _('print user who committed change'))],

2463

_('hg grep [OPTION]... PATTERN [FILE]...')),

2475

_('hg grep [OPTION]... PATTERN [FILE]...')),

2464

"heads":

2476

"heads":

2465

(heads,

2477

(heads,

2466

[('b', 'branches', None, _('show branches')),

2478

[('b', 'branches', None, _('show branches')),

2467

('r', 'rev', '', _('show only heads which are descendants of rev'))],

2479

('r', 'rev', '', _('show only heads which are descendants of rev'))],

2468

_('hg heads [-b] [-r <rev>]')),

2480

_('hg heads [-b] [-r <rev>]')),

2469

"help": (help_, [], _('hg help [COMMAND]')),

2481

"help": (help_, [], _('hg help [COMMAND]')),

2470

"identify|id": (identify, [], _('hg identify')),

2482

"identify|id": (identify, [], _('hg identify')),

2471

"import|patch":

2483

"import|patch":

2472

(import_,

2484

(import_,

2473

[('p', 'strip', 1,

2485

[('p', 'strip', 1,

2474

_('directory strip option for patch. This has the same\n') +

2486

_('directory strip option for patch. This has the same\n') +

2475

_('meaning as the corresponding patch option')),

2487

_('meaning as the corresponding patch option')),

2476

('f', 'force', None,

2488

('f', 'force', None,

2477

_('skip check for outstanding uncommitted changes')),

2489

_('skip check for outstanding uncommitted changes')),

2478

('b', 'base', '', _('base path'))],

2490

('b', 'base', '', _('base path'))],

2479

_('hg import [-f] [-p NUM] [-b BASE] PATCH...')),

2491

_('hg import [-f] [-p NUM] [-b BASE] PATCH...')),

2480

"incoming|in": (incoming,

2492

"incoming|in": (incoming,

2481

[('M', 'no-merges', None, _('do not show merges')),

2493

[('M', 'no-merges', None, _('do not show merges')),

2482

('p', 'patch', None, _('show patch')),

2494

('p', 'patch', None, _('show patch')),

2483

('n', 'newest-first', None, _('show newest record first'))],

2495

('n', 'newest-first', None, _('show newest record first'))],

2484

_('hg incoming [-p] [-n] [-M] [SOURCE]')),

2496

_('hg incoming [-p] [-n] [-M] [SOURCE]')),

2485

"^init": (init, [], _('hg init [DEST]')),

2497

"^init": (init, [], _('hg init [DEST]')),

2486

"locate":

2498

"locate":

2487

(locate,

2499

(locate,

2488

[('r', 'rev', '', _('search the repository as it stood at rev')),

2500

[('r', 'rev', '', _('search the repository as it stood at rev')),

2489

('0', 'print0', None,

2501

('0', 'print0', None,

2490

_('end filenames with NUL, for use with xargs')),

2502

_('end filenames with NUL, for use with xargs')),

2491

('f', 'fullpath', None,

2503

('f', 'fullpath', None,

2492

_('print complete paths from the filesystem root')),

2504

_('print complete paths from the filesystem root')),

2493

('I', 'include', [], _('include names matching the given patterns')),

2505

('I', 'include', [], _('include names matching the given patterns')),

2494

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2506

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2495

_('hg locate [OPTION]... [PATTERN]...')),

2507

_('hg locate [OPTION]... [PATTERN]...')),

2496

"^log|history":

2508

"^log|history":

2497

(log,

2509

(log,

2498

[('I', 'include', [], _('include names matching the given patterns')),

2510

[('I', 'include', [], _('include names matching the given patterns')),

2499

('X', 'exclude', [], _('exclude names matching the given patterns')),

2511

('X', 'exclude', [], _('exclude names matching the given patterns')),

2500

('b', 'branches', None, _('show branches')),

2512

('b', 'branches', None, _('show branches')),

2501

('k', 'keyword', [], _('search for a keyword')),

2513

('k', 'keyword', [], _('search for a keyword')),

2502

('l', 'limit', '', _('limit number of changes displayed')),

2514

('l', 'limit', '', _('limit number of changes displayed')),

2503

('r', 'rev', [], _('show the specified revision or range')),

2515

('r', 'rev', [], _('show the specified revision or range')),

2504

('M', 'no-merges', None, _('do not show merges')),

2516

('M', 'no-merges', None, _('do not show merges')),

2505

('m', 'only-merges', None, _('show only merges')),

2517

('m', 'only-merges', None, _('show only merges')),

2506

('p', 'patch', None, _('show patch'))],

2518

('p', 'patch', None, _('show patch'))],

2507

_('hg log [-I] [-X] [-r REV]... [-p] [FILE]')),

2519

_('hg log [-I] [-X] [-r REV]... [-p] [FILE]')),

2508

"manifest": (manifest, [], _('hg manifest [REV]')),

2520

"manifest": (manifest, [], _('hg manifest [REV]')),

2509

"outgoing|out": (outgoing,

2521

"outgoing|out": (outgoing,

2510

[('M', 'no-merges', None, _('do not show merges')),

2522

[('M', 'no-merges', None, _('do not show merges')),

2511

('p', 'patch', None, _('show patch')),

2523

('p', 'patch', None, _('show patch')),

2512

('n', 'newest-first', None, _('show newest record first'))],

2524

('n', 'newest-first', None, _('show newest record first'))],

2513

_('hg outgoing [-p] [-n] [-M] [DEST]')),

2525

_('hg outgoing [-p] [-n] [-M] [DEST]')),

2514

"^parents":

2526

"^parents":

2515

(parents,

2527

(parents,

2516

[('b', 'branches', None, _('show branches'))],

2528

[('b', 'branches', None, _('show branches'))],

2517

_('hg parents [-b] [REV]')),

2529

_('hg parents [-b] [REV]')),

2518

"paths": (paths, [], _('hg paths [NAME]')),

2530

"paths": (paths, [], _('hg paths [NAME]')),

2519

"^pull":

2531

"^pull":

2520

(pull,

2532

(pull,

2521

[('u', 'update', None,

2533

[('u', 'update', None,

2522

_('update the working directory to tip after pull')),

2534

_('update the working directory to tip after pull')),

2523

('e', 'ssh', '', _('specify ssh command to use')),

2535

('e', 'ssh', '', _('specify ssh command to use')),

2524

('r', 'rev', [], _('a specific revision you would like to pull')),

2536

('r', 'rev', [], _('a specific revision you would like to pull')),

2525

('', 'remotecmd', '',

2537

('', 'remotecmd', '',

2526

_('specify hg command to run on the remote side'))],

2538

_('specify hg command to run on the remote side'))],

2527

_('hg pull [-u] [-e FILE] [-r rev]... [--remotecmd FILE] [SOURCE]')),

2539

_('hg pull [-u] [-e FILE] [-r rev]... [--remotecmd FILE] [SOURCE]')),

2528

"^push":

2540

"^push":

2529

(push,

2541

(push,

2530

[('f', 'force', None, _('force push')),

2542

[('f', 'force', None, _('force push')),

2531

('e', 'ssh', '', _('specify ssh command to use')),

2543

('e', 'ssh', '', _('specify ssh command to use')),

2532

('r', 'rev', [], _('a specific revision you would like to push')),

2544

('r', 'rev', [], _('a specific revision you would like to push')),

2533

('', 'remotecmd', '',

2545

('', 'remotecmd', '',

2534

_('specify hg command to run on the remote side'))],

2546

_('specify hg command to run on the remote side'))],

2535

_('hg push [-f] [-e FILE] [-r rev]... [--remotecmd FILE] [DEST]')),

2547

_('hg push [-f] [-e FILE] [-r rev]... [--remotecmd FILE] [DEST]')),

2536

"rawcommit":

2548

"rawcommit":

2537

(rawcommit,

2549

(rawcommit,

2538

[('p', 'parent', [], _('parent')),

2550

[('p', 'parent', [], _('parent')),

2539

('d', 'date', '', _('date code')),

2551

('d', 'date', '', _('date code')),

2540

('u', 'user', '', _('user')),

2552

('u', 'user', '', _('user')),

2541

('F', 'files', '', _('file list')),

2553

('F', 'files', '', _('file list')),

2542

('m', 'message', '', _('commit message')),

2554

('m', 'message', '', _('commit message')),

2543

('l', 'logfile', '', _('commit message file'))],

2555

('l', 'logfile', '', _('commit message file'))],

2544

_('hg rawcommit [OPTION]... [FILE]...')),

2556

_('hg rawcommit [OPTION]... [FILE]...')),

2545

"recover": (recover, [], _('hg recover')),

2557

"recover": (recover, [], _('hg recover')),

2546

"^remove|rm":

2558

"^remove|rm":

2547

(remove,

2559

(remove,

2548

[('I', 'include', [], _('include names matching the given patterns')),

2560

[('I', 'include', [], _('include names matching the given patterns')),

2549

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2561

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2550

_('hg remove [OPTION]... FILE...')),

2562

_('hg remove [OPTION]... FILE...')),

2551

"rename|mv":

2563

"rename|mv":

2552

(rename,

2564

(rename,

2553

[('I', 'include', [], _('include names matching the given patterns')),

2565

[('I', 'include', [], _('include names matching the given patterns')),

2554

('X', 'exclude', [], _('exclude names matching the given patterns')),

2566

('X', 'exclude', [], _('exclude names matching the given patterns')),

2555

('A', 'after', None, _('record a rename that has already occurred')),

2567

('A', 'after', None, _('record a rename that has already occurred')),

2556

('f', 'force', None,

2568

('f', 'force', None,

2557

_('forcibly copy over an existing managed file'))],

2569

_('forcibly copy over an existing managed file'))],

2558

_('hg rename [OPTION]... [SOURCE]... DEST')),

2570

_('hg rename [OPTION]... [SOURCE]... DEST')),

2559

"^revert":

2571

"^revert":

2560

(revert,

2572

(revert,

2561

[('I', 'include', [], _('include names matching the given patterns')),

2573

[('I', 'include', [], _('include names matching the given patterns')),

2562

('X', 'exclude', [], _('exclude names matching the given patterns')),

2574

('X', 'exclude', [], _('exclude names matching the given patterns')),

2563

('r', 'rev', '', _('revision to revert to'))],

2575

('r', 'rev', '', _('revision to revert to'))],

2564

_('hg revert [-n] [-r REV] [NAME]...')),

2576

_('hg revert [-n] [-r REV] [NAME]...')),

2565

"root": (root, [], _('hg root')),

2577

"root": (root, [], _('hg root')),

2566

"^serve":

2578

"^serve":

2567

(serve,

2579

(serve,

2568

[('A', 'accesslog', '', _('name of access log file to write to')),

2580

[('A', 'accesslog', '', _('name of access log file to write to')),

2569

('d', 'daemon', None, _('run server in background')),

2581

('d', 'daemon', None, _('run server in background')),

2570

('', 'daemon-pipefds', '', _('used internally by daemon mode')),

2582

('', 'daemon-pipefds', '', _('used internally by daemon mode')),

2571

('E', 'errorlog', '', _('name of error log file to write to')),

2583

('E', 'errorlog', '', _('name of error log file to write to')),

2572

('p', 'port', 0, _('port to use (default: 8000)')),

2584

('p', 'port', 0, _('port to use (default: 8000)')),

2573

('a', 'address', '', _('address to use')),

2585

('a', 'address', '', _('address to use')),

2574

('n', 'name', '',

2586

('n', 'name', '',

2575

_('name to show in web pages (default: working dir)')),

2587

_('name to show in web pages (default: working dir)')),

2576

('', 'pid-file', '', _('name of file to write process ID to')),

2588

('', 'pid-file', '', _('name of file to write process ID to')),

2577

('', 'stdio', None, _('for remote clients')),

2589

('', 'stdio', None, _('for remote clients')),

2578

('t', 'templates', '', _('web templates to use')),

2590

('t', 'templates', '', _('web templates to use')),

2579

('', 'style', '', _('template style to use')),

2591

('', 'style', '', _('template style to use')),

2580

('6', 'ipv6', None, _('use IPv6 in addition to IPv4'))],

2592

('6', 'ipv6', None, _('use IPv6 in addition to IPv4'))],

2581

_('hg serve [OPTION]...')),

2593

_('hg serve [OPTION]...')),

2582

"^status|st":

2594

"^status|st":

2583

(status,

2595

(status,

2584

[('m', 'modified', None, _('show only modified files')),

2596

[('m', 'modified', None, _('show only modified files')),

2585

('a', 'added', None, _('show only added files')),

2597

('a', 'added', None, _('show only added files')),

2586

('r', 'removed', None, _('show only removed files')),

2598

('r', 'removed', None, _('show only removed files')),

2587

('d', 'deleted', None, _('show only deleted (but tracked) files')),

2599

('d', 'deleted', None, _('show only deleted (but tracked) files')),

2588

('u', 'unknown', None, _('show only unknown (not tracked) files')),

2600

('u', 'unknown', None, _('show only unknown (not tracked) files')),

2589

('n', 'no-status', None, _('hide status prefix')),

2601

('n', 'no-status', None, _('hide status prefix')),

2590

('0', 'print0', None,

2602

('0', 'print0', None,

2591

_('end filenames with NUL, for use with xargs')),

2603

_('end filenames with NUL, for use with xargs')),

2592

('I', 'include', [], _('include names matching the given patterns')),

2604

('I', 'include', [], _('include names matching the given patterns')),

2593

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2605

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2594

_('hg status [OPTION]... [FILE]...')),

2606

_('hg status [OPTION]... [FILE]...')),

2595

"tag":

2607

"tag":

2596

(tag,

2608

(tag,

2597

[('l', 'local', None, _('make the tag local')),

2609

[('l', 'local', None, _('make the tag local')),

2598

('m', 'message', '', _('message for tag commit log entry')),

2610

('m', 'message', '', _('message for tag commit log entry')),

2599

('d', 'date', '', _('record datecode as commit date')),

2611

('d', 'date', '', _('record datecode as commit date')),

2600

('u', 'user', '', _('record user as commiter')),

2612

('u', 'user', '', _('record user as commiter')),

2601

('r', 'rev', '', _('revision to tag'))],

2613

('r', 'rev', '', _('revision to tag'))],

2602

_('hg tag [-r REV] [OPTION]... NAME')),

2614

_('hg tag [-l -m <text> -d <datecode> -u <user> -r <rev>] <name>')),

2603

"tags": (tags, [], _('hg tags')),

2615

"tags": (tags, [], _('hg tags')),

2604

"tip":

2616

"tip":

2605

(tip,

2617

(tip,

2606

[('b', 'branches', None, _('show branches')),

2618

[('b', 'branches', None, _('show branches')),

2607

('p', 'patch', None, _('show patch'))],

2619

('p', 'patch', None, _('show patch'))],

2608

_('hg [-b] [-p] ~~tip~~')),

2620

_('hg tip [-b] [-p]')),

2609

"unbundle":

2621

"unbundle":

2610

(unbundle,

2622

(unbundle,

2611

[('u', 'update', None,

2623

[('u', 'update', None,

2612

_('update the working directory to tip after unbundle'))],

2624

_('update the working directory to tip after unbundle'))],

2613

_('hg unbundle [-u] FILE')),

2625

_('hg unbundle [-u] FILE')),

2614

"undo": (undo, [], _('hg undo')),

2626

"undo": (undo, [], _('hg undo')),

2615

"^update|up|checkout|co":

2627

"^update|up|checkout|co":

2616

(update,

2628

(update,

2617

[('b', 'branch', '', _('checkout the head of a specific branch')),

2629

[('b', 'branch', '', _('checkout the head of a specific branch')),

2618

('m', 'merge', None, _('allow merging of branches')),

2630

('m', 'merge', None, _('allow merging of branches')),

2619

('C', 'clean', None, _('overwrite locally modified files')),

2631

('C', 'clean', None, _('overwrite locally modified files')),

2620

('f', 'force', None, _('force a merge with outstanding changes'))],

2632

('f', 'force', None, _('force a merge with outstanding changes'))],

2621

_('hg update [-b TAG] [-m] [-C] [-f] [REV]')),

2633

_('hg update [-b TAG] [-m] [-C] [-f] [REV]')),

2622

"verify": (verify, [], _('hg verify')),

2634

"verify": (verify, [], _('hg verify')),

2623

"version": (show_version, [], _('hg version')),

2635

"version": (show_version, [], _('hg version')),

2624

}

2636

}

2625

2637

2626

globalopts = [

2638

globalopts = [

2627

('R', 'repository', '', _('repository root directory')),

2639

('R', 'repository', '', _('repository root directory')),

2628

('', 'cwd', '', _('change working directory')),

2640

('', 'cwd', '', _('change working directory')),

2629

('y', 'noninteractive', None,

2641

('y', 'noninteractive', None,

2630

_('do not prompt, assume \'yes\' for any required answers')),

2642

_('do not prompt, assume \'yes\' for any required answers')),

2631

('q', 'quiet', None, _('suppress output')),

2643

('q', 'quiet', None, _('suppress output')),

2632

('v', 'verbose', None, _('enable additional output')),

2644

('v', 'verbose', None, _('enable additional output')),

2633

('', 'debug', None, _('enable debugging output')),

2645

('', 'debug', None, _('enable debugging output')),

2634

('', 'debugger', None, _('start debugger')),

2646

('', 'debugger', None, _('start debugger')),

2635

('', 'traceback', None, _('print traceback on exception')),

2647

('', 'traceback', None, _('print traceback on exception')),

2636

('', 'time', None, _('time how long the command takes')),

2648

('', 'time', None, _('time how long the command takes')),

2637

('', 'profile', None, _('print command execution profile')),

2649

('', 'profile', None, _('print command execution profile')),

2638

('', 'version', None, _('output version information and exit')),

2650

('', 'version', None, _('output version information and exit')),

2639

('h', 'help', None, _('display help and exit')),

2651

('h', 'help', None, _('display help and exit')),

2640

]

2652

]

2641

2653

2642

norepo = ("clone init version help debugancestor debugconfig debugdata"

2654

norepo = ("clone init version help debugancestor debugconfig debugdata"

2643

" debugindex debugindexdot paths")

2655

" debugindex debugindexdot paths")

2644

2656

2645

def find(cmd):

2657

def find(cmd):

2646

"""Return (aliases, command table entry) for command string."""

2658

"""Return (aliases, command table entry) for command string."""

2647

choice = None

2659

choice = None

2648

count = 0

2660

count = 0

2649

for e in table.keys():

2661

for e in table.keys():

2650

aliases = e.lstrip("^").split("|")

2662

aliases = e.lstrip("^").split("|")

2651

if cmd in aliases:

2663

if cmd in aliases:

2652

return aliases, table[e]

2664

return aliases, table[e]

2653

for a in aliases:

2665

for a in aliases:

2654

if a.startswith(cmd):

2666

if a.startswith(cmd):

2655

count += 1

2667

count += 1

2656

choice = aliases, table[e]

2668

choice = aliases, table[e]

2657

break

2669

break

2658

2670

2659

if count > 1:

2671

if count > 1:

2660

raise AmbiguousCommand(cmd)

2672

raise AmbiguousCommand(cmd)

2661

2673

2662

if choice:

2674

if choice:

2663

return choice

2675

return choice

2664

2676

2665

raise UnknownCommand(cmd)

2677

raise UnknownCommand(cmd)

2666

2678

2667

class SignalInterrupt(Exception):

2679

class SignalInterrupt(Exception):

2668

"""Exception raised on SIGTERM and SIGHUP."""

2680

"""Exception raised on SIGTERM and SIGHUP."""

2669

2681

2670

def catchterm(*args):

2682

def catchterm(*args):

2671

raise SignalInterrupt

2683

raise SignalInterrupt

2672

2684

2673

def run():

2685

def run():

2674

sys.exit(dispatch(sys.argv[1:]))

2686

sys.exit(dispatch(sys.argv[1:]))

2675

2687

2676

class ParseError(Exception):

2688

class ParseError(Exception):

2677

"""Exception raised on errors in parsing the command line."""

2689

"""Exception raised on errors in parsing the command line."""

2678

2690

2679

def parse(ui, args):

2691

def parse(ui, args):

2680

options = {}

2692

options = {}

2681

cmdoptions = {}

2693

cmdoptions = {}

2682

2694

2683

try:

2695

try:

2684

args = fancyopts.fancyopts(args, globalopts, options)

2696

args = fancyopts.fancyopts(args, globalopts, options)

2685

except fancyopts.getopt.GetoptError, inst:

2697

except fancyopts.getopt.GetoptError, inst:

2686

raise ParseError(None, inst)

2698

raise ParseError(None, inst)

2687

2699

2688

if args:

2700

if args:

2689

cmd, args = args[0], args[1:]

2701

cmd, args = args[0], args[1:]

2690

aliases, i = find(cmd)

2702

aliases, i = find(cmd)

2691

cmd = aliases[0]

2703

cmd = aliases[0]

2692

defaults = ui.config("defaults", cmd)

2704

defaults = ui.config("defaults", cmd)

2693

if defaults:

2705

if defaults:

2694

args = defaults.split() + args

2706

args = defaults.split() + args

2695

c = list(i[1])

2707

c = list(i[1])

2696

else:

2708

else:

2697

cmd = None

2709

cmd = None

2698

c = []

2710

c = []

2699

2711

2700

# combine global options into local

2712

# combine global options into local

2701

for o in globalopts:

2713

for o in globalopts:

2702

c.append((o[0], o[1], options[o[1]], o[3]))

2714

c.append((o[0], o[1], options[o[1]], o[3]))

2703

2715

2704

try:

2716

try:

2705

args = fancyopts.fancyopts(args, c, cmdoptions)

2717

args = fancyopts.fancyopts(args, c, cmdoptions)

2706

except fancyopts.getopt.GetoptError, inst:

2718

except fancyopts.getopt.GetoptError, inst:

2707

raise ParseError(cmd, inst)

2719

raise ParseError(cmd, inst)

2708

2720

2709

# separate global options back out

2721

# separate global options back out

2710

for o in globalopts:

2722

for o in globalopts:

2711

n = o[1]

2723

n = o[1]

2712

options[n] = cmdoptions[n]

2724

options[n] = cmdoptions[n]

2713

del cmdoptions[n]

2725

del cmdoptions[n]

2714

2726

2715

return (cmd, cmd and i[0] or None, args, options, cmdoptions)

2727

return (cmd, cmd and i[0] or None, args, options, cmdoptions)

2716

2728

2717

def dispatch(args):

2729

def dispatch(args):

2718

signal.signal(signal.SIGTERM, catchterm)

2730

signal.signal(signal.SIGTERM, catchterm)

2719

try:

2731

try:

2720

signal.signal(signal.SIGHUP, catchterm)

2732

signal.signal(signal.SIGHUP, catchterm)

2721

except AttributeError:

2733

except AttributeError:

2722

pass

2734

pass

2723

2735

2724

try:

2736

try:

2725

u = ui.ui()

2737

u = ui.ui()

2726

except util.Abort, inst:

2738

except util.Abort, inst:

2727

sys.stderr.write(_("abort: %s\n") % inst)

2739

sys.stderr.write(_("abort: %s\n") % inst)

2728

sys.exit(1)

2740

sys.exit(1)

2729

2741

2730

external = []

2742

external = []

2731

for x in u.extensions():

2743

for x in u.extensions():

2732

def on_exception(exc, inst):

2744

def on_exception(exc, inst):

2733

u.warn(_("*** failed to import extension %s\n") % x[1])

2745

u.warn(_("*** failed to import extension %s\n") % x[1])

2734

u.warn("%s\n" % inst)

2746

u.warn("%s\n" % inst)

2735

if "--traceback" in sys.argv[1:]:

2747

if "--traceback" in sys.argv[1:]:

2736

traceback.print_exc()

2748

traceback.print_exc()

2737

if x[1]:

2749

if x[1]:

2738

try:

2750

try:

2739

mod = imp.load_source(x[0], x[1])

2751

mod = imp.load_source(x[0], x[1])

2740

except Exception, inst:

2752

except Exception, inst:

2741

on_exception(Exception, inst)

2753

on_exception(Exception, inst)

2742

continue

2754

continue

2743

else:

2755

else:

2744

def importh(name):

2756

def importh(name):

2745

mod = __import__(name)

2757

mod = __import__(name)

2746

components = name.split('.')

2758

components = name.split('.')

2747

for comp in components[1:]:

2759

for comp in components[1:]:

2748

mod = getattr(mod, comp)

2760

mod = getattr(mod, comp)

2749

return mod

2761

return mod

2750

try:

2762

try:

2751

mod = importh(x[0])

2763

mod = importh(x[0])

2752

except Exception, inst:

2764

except Exception, inst:

2753

on_exception(Exception, inst)

2765

on_exception(Exception, inst)

2754

continue

2766

continue

2755

2767

2756

external.append(mod)

2768

external.append(mod)

2757

for x in external:

2769

for x in external:

2758

cmdtable = getattr(x, 'cmdtable', {})

2770

cmdtable = getattr(x, 'cmdtable', {})

2759

for t in cmdtable:

2771

for t in cmdtable:

2760

if t in table:

2772

if t in table:

2761

u.warn(_("module %s overrides %s\n") % (x.__name__, t))

2773

u.warn(_("module %s overrides %s\n") % (x.__name__, t))

2762

table.update(cmdtable)

2774

table.update(cmdtable)

2763

2775

2764

try:

2776

try:

2765

cmd, func, args, options, cmdoptions = parse(u, args)

2777

cmd, func, args, options, cmdoptions = parse(u, args)

2766

except ParseError, inst:

2778

except ParseError, inst:

2767

if inst.args[0]:

2779

if inst.args[0]:

2768

u.warn(_("hg %s: %s\n") % (inst.args[0], inst.args[1]))

2780

u.warn(_("hg %s: %s\n") % (inst.args[0], inst.args[1]))

2769

help_(u, inst.args[0])

2781

help_(u, inst.args[0])

2770

else:

2782

else:

2771

u.warn(_("hg: %s\n") % inst.args[1])

2783

u.warn(_("hg: %s\n") % inst.args[1])

2772

help_(u, 'shortlist')

2784

help_(u, 'shortlist')

2773

sys.exit(-1)

2785

sys.exit(-1)

2774

except AmbiguousCommand, inst:

2786

except AmbiguousCommand, inst:

2775

u.warn(_("hg: command '%s' is ambiguous.\n") % inst.args[0])

2787

u.warn(_("hg: command '%s' is ambiguous.\n") % inst.args[0])

2776

sys.exit(1)

2788

sys.exit(1)

2777

except UnknownCommand, inst:

2789

except UnknownCommand, inst:

2778

u.warn(_("hg: unknown command '%s'\n") % inst.args[0])

2790

u.warn(_("hg: unknown command '%s'\n") % inst.args[0])

2779

help_(u, 'shortlist')

2791

help_(u, 'shortlist')

2780

sys.exit(1)

2792

sys.exit(1)

2781

2793

2782

if options["time"]:

2794

if options["time"]:

2783

def get_times():

2795

def get_times():

2784

t = os.times()

2796

t = os.times()

2785

if t[4] == 0.0: # Windows leaves this as zero, so use time.clock()

2797

if t[4] == 0.0: # Windows leaves this as zero, so use time.clock()

2786

t = (t[0], t[1], t[2], t[3], time.clock())

2798

t = (t[0], t[1], t[2], t[3], time.clock())

2787

return t

2799

return t

2788

s = get_times()

2800

s = get_times()

2789

def print_time():

2801

def print_time():

2790

t = get_times()

2802

t = get_times()

2791

u.warn(_("Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n") %

2803

u.warn(_("Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n") %

2792

(t[4]-s[4], t[0]-s[0], t[2]-s[2], t[1]-s[1], t[3]-s[3]))

2804

(t[4]-s[4], t[0]-s[0], t[2]-s[2], t[1]-s[1], t[3]-s[3]))

2793

atexit.register(print_time)

2805

atexit.register(print_time)

2794

2806

2795

u.updateopts(options["verbose"], options["debug"], options["quiet"],

2807

u.updateopts(options["verbose"], options["debug"], options["quiet"],

2796

not options["noninteractive"])

2808

not options["noninteractive"])

2797

2809

2798

# enter the debugger before command execution

2810

# enter the debugger before command execution

2799

if options['debugger']:

2811

if options['debugger']:

2800

pdb.set_trace()

2812

pdb.set_trace()

2801

2813

2802

try:

2814

try:

2803

try:

2815

try:

2804

if options['help']:

2816

if options['help']:

2805

help_(u, cmd, options['version'])

2817

help_(u, cmd, options['version'])

2806

sys.exit(0)

2818

sys.exit(0)

2807

elif options['version']:

2819

elif options['version']:

2808

show_version(u)

2820

show_version(u)

2809

sys.exit(0)

2821

sys.exit(0)

2810

elif not cmd:

2822

elif not cmd:

2811

help_(u, 'shortlist')

2823

help_(u, 'shortlist')

2812

sys.exit(0)

2824

sys.exit(0)

2813

2825

2814

if options['cwd']:

2826

if options['cwd']:

2815

try:

2827

try:

2816

os.chdir(options['cwd'])

2828

os.chdir(options['cwd'])

2817

except OSError, inst:

2829

except OSError, inst:

2818

raise util.Abort('%s: %s' %

2830

raise util.Abort('%s: %s' %

2819

(options['cwd'], inst.strerror))

2831

(options['cwd'], inst.strerror))

2820

2832

2821

if cmd not in norepo.split():

2833

if cmd not in norepo.split():

2822

path = options["repository"] or ""

2834

path = options["repository"] or ""

2823

repo = hg.repository(ui=u, path=path)

2835

repo = hg.repository(ui=u, path=path)

2824

for x in external:

2836

for x in external:

2825

if hasattr(x, 'reposetup'):

2837

if hasattr(x, 'reposetup'):

2826

x.reposetup(u, repo)

2838

x.reposetup(u, repo)

2827

d = lambda: func(u, repo, *args, **cmdoptions)

2839

d = lambda: func(u, repo, *args, **cmdoptions)

2828

else:

2840

else:

2829

d = lambda: func(u, *args, **cmdoptions)

2841

d = lambda: func(u, *args, **cmdoptions)

2830

2842

2831

if options['profile']:

2843

if options['profile']:

2832

import hotshot, hotshot.stats

2844

import hotshot, hotshot.stats

2833

prof = hotshot.Profile("hg.prof")

2845

prof = hotshot.Profile("hg.prof")

2834

r = prof.runcall(d)

2846

r = prof.runcall(d)

2835

prof.close()

2847

prof.close()

2836

stats = hotshot.stats.load("hg.prof")

2848

stats = hotshot.stats.load("hg.prof")

2837

stats.strip_dirs()

2849

stats.strip_dirs()

2838

stats.sort_stats('time', 'calls')

2850

stats.sort_stats('time', 'calls')

2839

stats.print_stats(40)

2851

stats.print_stats(40)

2840

return r

2852

return r

2841

else:

2853

else:

2842

return d()

2854

return d()

2843

except:

2855

except:

2844

# enter the debugger when we hit an exception

2856

# enter the debugger when we hit an exception

2845

if options['debugger']:

2857

if options['debugger']:

2846

pdb.post_mortem(sys.exc_info()[2])

2858

pdb.post_mortem(sys.exc_info()[2])

2847

if options['traceback']:

2859

if options['traceback']:

2848

traceback.print_exc()

2860

traceback.print_exc()

2849

raise

2861

raise

2850

except hg.RepoError, inst:

2862

except hg.RepoError, inst:

2851

u.warn(_("abort: "), inst, "!\n")

2863

u.warn(_("abort: "), inst, "!\n")

2852

except revlog.RevlogError, inst:

2864

except revlog.RevlogError, inst:

2853

u.warn(_("abort: "), inst, "!\n")

2865

u.warn(_("abort: "), inst, "!\n")

2854

except SignalInterrupt:

2866

except SignalInterrupt:

2855

u.warn(_("killed!\n"))

2867

u.warn(_("killed!\n"))

2856

except KeyboardInterrupt:

2868

except KeyboardInterrupt:

2857

try:

2869

try:

2858

u.warn(_("interrupted!\n"))

2870

u.warn(_("interrupted!\n"))

2859

except IOError, inst:

2871

except IOError, inst:

2860

if inst.errno == errno.EPIPE:

2872

if inst.errno == errno.EPIPE:

2861

if u.debugflag:

2873

if u.debugflag:

2862

u.warn(_("\nbroken pipe\n"))

2874

u.warn(_("\nbroken pipe\n"))

2863

else:

2875

else:

2864

raise

2876

raise

2865

except IOError, inst:

2877

except IOError, inst:

2866

if hasattr(inst, "code"):

2878

if hasattr(inst, "code"):

2867

u.warn(_("abort: %s\n") % inst)

2879

u.warn(_("abort: %s\n") % inst)

2868

elif hasattr(inst, "reason"):

2880

elif hasattr(inst, "reason"):

2869

u.warn(_("abort: error: %s\n") % inst.reason[1])

2881

u.warn(_("abort: error: %s\n") % inst.reason[1])

2870

elif hasattr(inst, "args") and inst[0] == errno.EPIPE:

2882

elif hasattr(inst, "args") and inst[0] == errno.EPIPE:

2871

if u.debugflag:

2883

if u.debugflag:

2872

u.warn(_("broken pipe\n"))

2884

u.warn(_("broken pipe\n"))

2873

elif getattr(inst, "strerror", None):

2885

elif getattr(inst, "strerror", None):

2874

if getattr(inst, "filename", None):

2886

if getattr(inst, "filename", None):

2875

u.warn(_("abort: %s - %s\n") % (inst.strerror, inst.filename))

2887

u.warn(_("abort: %s - %s\n") % (inst.strerror, inst.filename))

2876

else:

2888

else:

2877

u.warn(_("abort: %s\n") % inst.strerror)

2889

u.warn(_("abort: %s\n") % inst.strerror)

2878

else:

2890

else:

2879

raise

2891

raise

2880

except OSError, inst:

2892

except OSError, inst:

2881

if hasattr(inst, "filename"):

2893

if hasattr(inst, "filename"):

2882

u.warn(_("abort: %s: %s\n") % (inst.strerror, inst.filename))

2894

u.warn(_("abort: %s: %s\n") % (inst.strerror, inst.filename))

2883

else:

2895

else:

2884

u.warn(_("abort: %s\n") % inst.strerror)

2896

u.warn(_("abort: %s\n") % inst.strerror)

2885

except util.Abort, inst:

2897

except util.Abort, inst:

2886

u.warn(_('abort: '), inst.args[0] % inst.args[1:], '\n')

2898

u.warn(_('abort: '), inst.args[0] % inst.args[1:], '\n')

2887

sys.exit(1)

2899

sys.exit(1)

2888

except TypeError, inst:

2900

except TypeError, inst:

2889

# was this an argument error?

2901

# was this an argument error?

2890

tb = traceback.extract_tb(sys.exc_info()[2])

2902

tb = traceback.extract_tb(sys.exc_info()[2])

2891

if len(tb) > 2: # no

2903

if len(tb) > 2: # no

2892

raise

2904

raise

2893

u.debug(inst, "\n")

2905

u.debug(inst, "\n")

2894

u.warn(_("%s: invalid arguments\n") % cmd)

2906

u.warn(_("%s: invalid arguments\n") % cmd)

2895

help_(u, cmd)

2907

help_(u, cmd)

2896

except AmbiguousCommand, inst:

2908

except AmbiguousCommand, inst:

2897

u.warn(_("hg: command '%s' is ambiguous.\n") % inst.args[0])

2909

u.warn(_("hg: command '%s' is ambiguous.\n") % inst.args[0])

2898

help_(u, 'shortlist')

2910

help_(u, 'shortlist')

2899

except UnknownCommand, inst:

2911

except UnknownCommand, inst:

2900

u.warn(_("hg: unknown command '%s'\n") % inst.args[0])

2912

u.warn(_("hg: unknown command '%s'\n") % inst.args[0])

2901

help_(u, 'shortlist')

2913

help_(u, 'shortlist')

2902

except SystemExit:

2914

except SystemExit:

2903

# don't catch this in the catch-all below

2915

# don't catch this in the catch-all below

2904

raise

2916

raise

2905

except:

2917

except:

2906

u.warn(_("** unknown exception encountered, details follow\n"))

2918

u.warn(_("** unknown exception encountered, details follow\n"))

2907

u.warn(_("** report bug details to mercurial@selenic.com\n"))

2919

u.warn(_("** report bug details to mercurial@selenic.com\n"))

2908

u.warn(_("** Mercurial Distributed SCM (version %s)\n")

2920

u.warn(_("** Mercurial Distributed SCM (version %s)\n")

2909

% version.get_version())

2921

% version.get_version())

2910

raise

2922

raise

2911

2923

2912

sys.exit(-1)

2924

sys.exit(-1)

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

             # commands.py - command processing for mercurial
             #
             # Copyright 2005 Matt Mackall <mpm@selenic.com>
             #
             # This software may be used and distributed according to the terms
             # of the GNU General Public License, incorporated herein by reference.
             from demandload import demandload
             from node import *
             from i18n import gettext as _
             demandload(globals(), "os re sys signal shutil imp urllib pdb")
             demandload(globals(), "fancyopts ui hg util lock revlog")
             demandload(globals(), "fnmatch hgweb mdiff random signal time traceback")
             demandload(globals(), "errno socket version struct atexit sets bz2")
             class UnknownCommand(Exception):
                 """Exception raised if command is not in the command table."""
             class AmbiguousCommand(Exception):
                 """Exception raised if command shortcut matches more than one command."""
             def filterfiles(filters, files):
                 l = [x for x in files if x in filters]
                 for t in filters:
                     if t and t[-1] != "/":
                         t += "/"
                     l += [x for x in files if x.startswith(t)]
                 return l
             def relpath(repo, args):
                 cwd = repo.getcwd()
                 if cwd:
                     return [util.normpath(os.path.join(cwd, x)) for x in args]
                 return args
             def matchpats(repo, pats=[], opts={}, head=''):
                 cwd = repo.getcwd()
                 if not pats and cwd:
                     opts['include'] = [os.path.join(cwd, i) for i in opts['include']]
                     opts['exclude'] = [os.path.join(cwd, x) for x in opts['exclude']]
                     cwd = ''
                 return util.cmdmatcher(repo.root, cwd, pats or ['.'], opts.get('include'),
                                        opts.get('exclude'), head)
             def makewalk(repo, pats, opts, node=None, head=''):
                 files, matchfn, anypats = matchpats(repo, pats, opts, head)
                 exact = dict(zip(files, files))
                 def walk():
                     for src, fn in repo.walk(node=node, files=files, match=matchfn):
                         yield src, fn, util.pathto(repo.getcwd(), fn), fn in exact
                 return files, matchfn, walk()
             def walk(repo, pats, opts, node=None, head=''):
                 files, matchfn, results = makewalk(repo, pats, opts, node, head)
                 for r in results:
                     yield r
             def walkchangerevs(ui, repo, pats, opts):
                 '''Iterate over files and the revs they changed in.
                 Callers most commonly need to iterate backwards over the history
                 it is interested in.  Doing so has awful (quadratic-looking)
                 performance, so we use iterators in a "windowed" way.
                 We walk a window of revisions in the desired order.  Within the
                 window, we first walk forwards to gather data, then in the desired
                 order (usually backwards) to display it.
                 This function returns an (iterator, getchange, matchfn) tuple.  The
                 getchange function returns the changelog entry for a numeric
                 revision.  The iterator yields 3-tuples.  They will be of one of
                 the following forms:
                 "window", incrementing, lastrev: stepping through a window,
                 positive if walking forwards through revs, last rev in the
                 sequence iterated over - use to reset state for the current window
                 "add", rev, fns: out-of-order traversal of the given file names
                 fns, which changed during revision rev - use to gather data for
                 possible display
                 "iter", rev, None: in-order traversal of the revs earlier iterated
                 over with "add" - use to display data'''
                 def increasing_windows(start, end, windowsize=8, sizelimit=512):
                     if start < end:
                         while start < end:
                             yield start, min(windowsize, end-start)
                             start += windowsize
                             if windowsize < sizelimit:
                                 windowsize *= 2
                     else:
                         while start > end:
                             yield start, min(windowsize, start-end-1)
                             start -= windowsize
                             if windowsize < sizelimit:
                                 windowsize *= 2
                 files, matchfn, anypats = matchpats(repo, pats, opts)
                 if repo.changelog.count() == 0:
                     return [], False, matchfn
                 revs = map(int, revrange(ui, repo, opts['rev'] or ['tip:0']))
                 wanted = {}
                 slowpath = anypats
                 fncache = {}
                 chcache = {}
                 def getchange(rev):
                     ch = chcache.get(rev)
                     if ch is None:
                         chcache[rev] = ch = repo.changelog.read(repo.lookup(str(rev)))
                     return ch
                 if not slowpath and not files:
                     # No files, no patterns.  Display all revs.
                     wanted = dict(zip(revs, revs))
                 if not slowpath:
                     # Only files, no patterns.  Check the history of each file.
                     def filerevgen(filelog):
                         for i, window in increasing_windows(filelog.count()-1, -1):
                             revs = []
                             for j in xrange(i - window, i + 1):
                                 revs.append(filelog.linkrev(filelog.node(j)))
                             revs.reverse()
                             for rev in revs:
                                 yield rev
                     minrev, maxrev = min(revs), max(revs)
                     for file_ in files:
                         filelog = repo.file(file_)
                         # A zero count may be a directory or deleted file, so
                         # try to find matching entries on the slow path.
                         if filelog.count() == 0:
                             slowpath = True
                             break
                         for rev in filerevgen(filelog):
                             if rev <= maxrev:
                                 if rev < minrev:
                                     break
                                 fncache.setdefault(rev, [])
                                 fncache[rev].append(file_)
                                 wanted[rev] = 1
                 if slowpath:
                     # The slow path checks files modified in every changeset.
                     def changerevgen():
                         for i, window in increasing_windows(repo.changelog.count()-1, -1):
                             for j in xrange(i - window, i + 1):
                                 yield j, getchange(j)[3]
                     for rev, changefiles in changerevgen():
                         matches = filter(matchfn, changefiles)
                         if matches:
                             fncache[rev] = matches
                             wanted[rev] = 1
                 def iterate():
                     for i, window in increasing_windows(0, len(revs)):
                         yield 'window', revs[0] < revs[-1], revs[-1]
                         nrevs = [rev for rev in revs[i:i+window]
                                  if rev in wanted]
                         srevs = list(nrevs)
                         srevs.sort()
                         for rev in srevs:
                             fns = fncache.get(rev) or filter(matchfn, getchange(rev)[3])
                             yield 'add', rev, fns
                         for rev in nrevs:
                             yield 'iter', rev, None
                 return iterate(), getchange, matchfn
             revrangesep = ':'
             def revrange(ui, repo, revs, revlog=None):
                 """Yield revision as strings from a list of revision specifications."""
                 if revlog is None:
                     revlog = repo.changelog
                 revcount = revlog.count()
                 def fix(val, defval):
                     if not val:
                         return defval
                     try:
                         num = int(val)
                         if str(num) != val:
                             raise ValueError
                         if num < 0:
                             num += revcount
                         if num < 0:
                             num = 0
                         elif num >= revcount:
                             raise ValueError
                     except ValueError:
                         try:
                             num = repo.changelog.rev(repo.lookup(val))
                         except KeyError:
                             try:
                                 num = revlog.rev(revlog.lookup(val))
                             except KeyError:
                                 raise util.Abort(_('invalid revision identifier %s'), val)
                     return num
                 seen = {}
                 for spec in revs:
                     if spec.find(revrangesep) >= 0:
                         start, end = spec.split(revrangesep, 1)
                         start = fix(start, 0)
                         end = fix(end, revcount - 1)
                         step = start > end and -1 or 1
                         for rev in xrange(start, end+step, step):
                             if rev in seen:
                                 continue
                             seen[rev] = 1
                             yield str(rev)
                     else:
                         rev = fix(spec, None)
                         if rev in seen:
                             continue
                         seen[rev] = 1
                         yield str(rev)
             def make_filename(repo, r, pat, node=None,
                               total=None, seqno=None, revwidth=None, pathname=None):
                 node_expander = {
                     'H': lambda: hex(node),
                     'R': lambda: str(r.rev(node)),
                     'h': lambda: short(node),
                     }
                 expander = {
                     '%': lambda: '%',
                     'b': lambda: os.path.basename(repo.root),
                     }
                 try:
                     if node:
                         expander.update(node_expander)
                     if node and revwidth is not None:
                         expander['r'] = lambda: str(r.rev(node)).zfill(revwidth)
                     if total is not None:
                         expander['N'] = lambda: str(total)
                     if seqno is not None:
                         expander['n'] = lambda: str(seqno)
                     if total is not None and seqno is not None:
                         expander['n'] = lambda:str(seqno).zfill(len(str(total)))
                     if pathname is not None:
                         expander['s'] = lambda: os.path.basename(pathname)
                         expander['d'] = lambda: os.path.dirname(pathname) or '.'
                         expander['p'] = lambda: pathname
                     newname = []
                     patlen = len(pat)
                     i = 0
                     while i < patlen:
                         c = pat[i]
                         if c == '%':
                             i += 1
                             c = pat[i]
                             c = expander[c]()
                         newname.append(c)
                         i += 1
                     return ''.join(newname)
                 except KeyError, inst:
                     raise util.Abort(_("invalid format spec '%%%s' in output file name"),
                                 inst.args[0])
             def make_file(repo, r, pat, node=None,
                           total=None, seqno=None, revwidth=None, mode='wb', pathname=None):
                 if not pat or pat == '-':
                     return 'w' in mode and sys.stdout or sys.stdin
                 if hasattr(pat, 'write') and 'w' in mode:
                     return pat
                 if hasattr(pat, 'read') and 'r' in mode:
                     return pat
                 return open(make_filename(repo, r, pat, node, total, seqno, revwidth,
                                           pathname),
                             mode)
             def dodiff(fp, ui, repo, node1, node2, files=None, match=util.always,
                        changes=None, text=False, opts={}):
                 if not node1:
                     node1 = repo.dirstate.parents()[0]
                 # reading the data for node1 early allows it to play nicely
                 # with repo.changes and the revlog cache.
                 change = repo.changelog.read(node1)
                 mmap = repo.manifest.read(change[0])
                 date1 = util.datestr(change[2])
                 if not changes:
                     changes = repo.changes(node1, node2, files, match=match)
                 modified, added, removed, deleted, unknown = changes
                 if files:
                     modified, added, removed = map(lambda x: filterfiles(files, x),
                                                    (modified, added, removed))
                 if not modified and not added and not removed:
                     return
                 if node2:
                     change = repo.changelog.read(node2)
                     mmap2 = repo.manifest.read(change[0])
                     date2 = util.datestr(change[2])
                     def read(f):
                         return repo.file(f).read(mmap2[f])
                 else:
                     date2 = util.datestr()
                     def read(f):
                         return repo.wread(f)
                 if ui.quiet:
                     r = None
                 else:
                     hexfunc = ui.verbose and hex or short
                     r = [hexfunc(node) for node in [node1, node2] if node]
                 diffopts = ui.diffopts()
                 showfunc = opts.get('show_function') or diffopts['showfunc']
                 ignorews = opts.get('ignore_all_space') or diffopts['ignorews']
                 for f in modified:
                     to = None
                     if f in mmap:
                         to = repo.file(f).read(mmap[f])
                     tn = read(f)
                     fp.write(mdiff.unidiff(to, date1, tn, date2, f, r, text=text,
                                            showfunc=showfunc, ignorews=ignorews))
                 for f in added:
                     to = None
                     tn = read(f)
                     fp.write(mdiff.unidiff(to, date1, tn, date2, f, r, text=text,
                                            showfunc=showfunc, ignorews=ignorews))
                 for f in removed:
                     to = repo.file(f).read(mmap[f])
                     tn = None
                     fp.write(mdiff.unidiff(to, date1, tn, date2, f, r, text=text,
                                            showfunc=showfunc, ignorews=ignorews))
             def trimuser(ui, name, rev, revcache):
                 """trim the name of the user who committed a change"""
                 user = revcache.get(rev)
                 if user is None:
                     user = revcache[rev] = ui.shortuser(name)
                 return user
             def show_changeset(ui, repo, rev=0, changenode=None, brinfo=None):
                 """show a single changeset or file revision"""
                 log = repo.changelog
                 if changenode is None:
                     changenode = log.node(rev)
                 elif not rev:
                     rev = log.rev(changenode)
                 if ui.quiet:
                     ui.write("%d:%s\n" % (rev, short(changenode)))
                     return
                 changes = log.read(changenode)
                 date = util.datestr(changes[2])
                 parents = [(log.rev(p), ui.verbose and hex(p) or short(p))
                            for p in log.parents(changenode)
                            if ui.debugflag or p != nullid]
                 if not ui.debugflag and len(parents) == 1 and parents[0][0] == rev-1:
                     parents = []
                 if ui.verbose:
                     ui.write(_("changeset:   %d:%s\n") % (rev, hex(changenode)))
                 else:
                     ui.write(_("changeset:   %d:%s\n") % (rev, short(changenode)))
                 for tag in repo.nodetags(changenode):
                     ui.status(_("tag:         %s\n") % tag)
                 for parent in parents:
                     ui.write(_("parent:      %d:%s\n") % parent)
                 if brinfo and changenode in brinfo:
                     br = brinfo[changenode]
                     ui.write(_("branch:      %s\n") % " ".join(br))
                 ui.debug(_("manifest:    %d:%s\n") % (repo.manifest.rev(changes[0]),
                                                   hex(changes[0])))
                 ui.status(_("user:        %s\n") % changes[1])
                 ui.status(_("date:        %s\n") % date)
                 if ui.debugflag:
                     files = repo.changes(log.parents(changenode)[0], changenode)
                     for key, value in zip([_("files:"), _("files+:"), _("files-:")], files):
                         if value:
                             ui.note("%-12s %s\n" % (key, " ".join(value)))
                 else:
                     ui.note(_("files:       %s\n") % " ".join(changes[3]))
                 description = changes[4].strip()
                 if description:
                     if ui.verbose:
                         ui.status(_("description:\n"))
                         ui.status(description)
                         ui.status("\n\n")
                     else:
                         ui.status(_("summary:     %s\n") % description.splitlines()[0])
                 ui.status("\n")
             def show_version(ui):
                 """output version and copyright information"""
                 ui.write(_("Mercurial Distributed SCM (version %s)\n")
                          % version.get_version())
                 ui.status(_(
                     "\nCopyright (C) 2005 Matt Mackall <mpm@selenic.com>\n"
                     "This is free software; see the source for copying conditions. "
                     "There is NO\nwarranty; "
                     "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
                 ))
             def help_(ui, cmd=None, with_version=False):
                 """show help for a given command or all commands"""
                 option_lists = []
                 if cmd and cmd != 'shortlist':
                     if with_version:
                         show_version(ui)
                         ui.write('\n')
                     aliases, i = find(cmd)
                     # synopsis
                     ui.write("%s\n\n" % i[2])
                     # description
                     doc = i[0].__doc__
                     if not doc:
                         doc = _("(No help text available)")
                     if ui.quiet:
                         doc = doc.splitlines(0)[0]
                     ui.write("%s\n" % doc.rstrip())
                     if not ui.quiet:
                         # aliases
                         if len(aliases) > 1:
                             ui.write(_("\naliases: %s\n") % ', '.join(aliases[1:]))
                         # options
                         if i[1]:
                             option_lists.append(("options", i[1]))
                 else:
                     # program name
                     if ui.verbose or with_version:
                         show_version(ui)
                     else:
                         ui.status(_("Mercurial Distributed SCM\n"))
                     ui.status('\n')
                     # list of commands
                     if cmd == "shortlist":
                         ui.status(_('basic commands (use "hg help" '
                                     'for the full list or option "-v" for details):\n\n'))
                     elif ui.verbose:
                         ui.status(_('list of commands:\n\n'))
                     else:
                         ui.status(_('list of commands (use "hg help -v" '
                                     'to show aliases and global options):\n\n'))
                     h = {}
                     cmds = {}
                     for c, e in table.items():
                         f = c.split("|")[0]
                         if cmd == "shortlist" and not f.startswith("^"):
                             continue
                         f = f.lstrip("^")
                         if not ui.debugflag and f.startswith("debug"):
                             continue
                         doc = e[0].__doc__
                         if not doc:
                             doc = _("(No help text available)")
                         h[f] = doc.splitlines(0)[0].rstrip()
                         cmds[f] = c.lstrip("^")
                     fns = h.keys()
                     fns.sort()
                     m = max(map(len, fns))
                     for f in fns:
                         if ui.verbose:
                             commands = cmds[f].replace("|",", ")
                             ui.write(" %s:\n      %s\n"%(commands, h[f]))
                         else:
                             ui.write(' %-*s   %s\n' % (m, f, h[f]))
                 # global options
                 if ui.verbose:
                     option_lists.append(("global options", globalopts))
                 # list all option lists
                 opt_output = []
                 for title, options in option_lists:
                     opt_output.append(("\n%s:\n" % title, None))
                     for shortopt, longopt, default, desc in options:
                         opt_output.append(("%2s%s" % (shortopt and "-%s" % shortopt,
                                                       longopt and " --%s" % longopt),
                                            "%s%s" % (desc,
                                                      default
                                                      and _(" (default: %s)") % default
                                                      or "")))
                 if opt_output:
                     opts_len = max([len(line[0]) for line in opt_output if line[1]])
                     for first, second in opt_output:
                         if second:
                             ui.write(" %-*s  %s\n" % (opts_len, first, second))
                         else:
                             ui.write("%s\n" % first)
             # Commands start here, listed alphabetically
             def add(ui, repo, *pats, **opts):
                 """add the specified files on the next commit
                 Schedule files to be version controlled and added to the repository.
                 The files will be added to the repository at the next commit.
                 If no names are given, add all files in the repository.
                 """
                 names = []
                 for src, abs, rel, exact in walk(repo, pats, opts):
                     if exact:
                         if ui.verbose:
                             ui.status(_('adding %s\n') % rel)
                         names.append(abs)
                     elif repo.dirstate.state(abs) == '?':
                         ui.status(_('adding %s\n') % rel)
                         names.append(abs)
                 repo.add(names)
             def addremove(ui, repo, *pats, **opts):
                 """add all new files, delete all missing files
                 Add all new files and remove all missing files from the repository.
                 New files are ignored if they match any of the patterns in .hgignore. As
                 with add, these changes take effect at the next commit.
                 """
                 return addremove_lock(ui, repo, pats, opts)
             def addremove_lock(ui, repo, pats, opts, wlock=None):
                 add, remove = [], []
                 for src, abs, rel, exact in walk(repo, pats, opts):
                     if src == 'f' and repo.dirstate.state(abs) == '?':
                         add.append(abs)
                         if ui.verbose or not exact:
                             ui.status(_('adding %s\n') % ((pats and rel) or abs))
                     if repo.dirstate.state(abs) != 'r' and not os.path.exists(rel):
                         remove.append(abs)
                         if ui.verbose or not exact:
                             ui.status(_('removing %s\n') % ((pats and rel) or abs))
                 repo.add(add, wlock=wlock)
                 repo.remove(remove, wlock=wlock)
             def annotate(ui, repo, *pats, **opts):
                 """show changeset information per file line
                 List changes in files, showing the revision id responsible for each line
                 This command is useful to discover who did a change or when a change took
                 place.
                 Without the -a option, annotate will avoid processing files it
                 detects as binary. With -a, annotate will generate an annotation
                 anyway, probably with undesirable results.
                 """
                 def getnode(rev):
                     return short(repo.changelog.node(rev))
                 ucache = {}
                 def getname(rev):
                     cl = repo.changelog.read(repo.changelog.node(rev))
                     return trimuser(ui, cl[1], rev, ucache)
                 dcache = {}
                 def getdate(rev):
                     datestr = dcache.get(rev)
                     if datestr is None:
                         cl = repo.changelog.read(repo.changelog.node(rev))
                         datestr = dcache[rev] = util.datestr(cl[2])
                     return datestr
                 if not pats:
                     raise util.Abort(_('at least one file name or pattern required'))
                 opmap = [['user', getname], ['number', str], ['changeset', getnode],
                          ['date', getdate]]
                 if not opts['user'] and not opts['changeset'] and not opts['date']:
                     opts['number'] = 1
                 if opts['rev']:
                     node = repo.changelog.lookup(opts['rev'])
                 else:
                     node = repo.dirstate.parents()[0]
                 change = repo.changelog.read(node)
                 mmap = repo.manifest.read(change[0])
                 for src, abs, rel, exact in walk(repo, pats, opts):
                     if abs not in mmap:
                         ui.warn(_("warning: %s is not in the repository!\n") %
                                 ((pats and rel) or abs))
                         continue
                     f = repo.file(abs)
                     if not opts['text'] and util.binary(f.read(mmap[abs])):
                         ui.write(_("%s: binary file\n") % ((pats and rel) or abs))
                         continue
                     lines = f.annotate(mmap[abs])
                     pieces = []
                     for o, f in opmap:
                         if opts[o]:
                             l = [f(n) for n, dummy in lines]
                             if l:
                                 m = max(map(len, l))
                                 pieces.append(["%*s" % (m, x) for x in l])
                     if pieces:
                         for p, l in zip(zip(*pieces), lines):
                             ui.write("%s: %s" % (" ".join(p), l[1]))
             def bundle(ui, repo, fname, dest="default-push", **opts):
                 """create a changegroup file
                 Generate a compressed changegroup file collecting all changesets
                 not found in the other repository.
                 This file can then be transferred using conventional means and
                 applied to another repository with the unbundle command. This is
                 useful when native push and pull are not available or when
                 exporting an entire repository is undesirable. The standard file
                 extension is ".hg".
                 Unlike import/export, this exactly preserves all changeset
                 contents including permissions, rename data, and revision history.
                 """
                 f = open(fname, "wb")
                 dest = ui.expandpath(dest, repo.root)
                 other = hg.repository(ui, dest)
                 o = repo.findoutgoing(other)
                 cg = repo.changegroup(o, 'bundle')
                 try:
                     f.write("HG10")
                     z = bz2.BZ2Compressor(9)
                     while 1:
                         chunk = cg.read(4096)
                         if not chunk:
                             break
                         f.write(z.compress(chunk))
                     f.write(z.flush())
                 except:
                     os.unlink(fname)
                     raise
             def cat(ui, repo, file1, *pats, **opts):
                 """output the latest or given revisions of files
                 Print the specified files as they were at the given revision.
                 If no revision is given then the tip is used.
                 Output may be to a file, in which case the name of the file is
                 given using a format string.  The formatting rules are the same as
                 for the export command, with the following additions:
                 %s   basename of file being printed
                 %d   dirname of file being printed, or '.' if in repo root
                 %p   root-relative path name of file being printed
                 """
                 mf = {}
                 rev = opts['rev']
                 if rev:
                     node = repo.lookup(rev)
                 else:
                     node = repo.changelog.tip()
                 change = repo.changelog.read(node)
                 mf = repo.manifest.read(change[0])
                 for src, abs, rel, exact in walk(repo, (file1,) + pats, opts, node):
                     r = repo.file(abs)
                     n = mf[abs]
                     fp = make_file(repo, r, opts['output'], node=n, pathname=abs)
                     fp.write(r.read(n))
             def clone(ui, source, dest=None, **opts):
                 """make a copy of an existing repository
                 Create a copy of an existing repository in a new directory.
                 If no destination directory name is specified, it defaults to the
                 basename of the source.
                 The location of the source is added to the new repository's
                 .hg/hgrc file, as the default to be used for future pulls.
                 For efficiency, hardlinks are used for cloning whenever the source
                 and destination are on the same filesystem.  Some filesystems,
                 such as AFS, implement hardlinking incorrectly, but do not report
                 errors.  In these cases, use the --pull option to avoid
                 hardlinking.
+                See pull for valid source format details.
                 """
                 if dest is None:
                     dest = os.path.basename(os.path.normpath(source))
                 if os.path.exists(dest):
                     raise util.Abort(_("destination '%s' already exists"), dest)
                 dest = os.path.realpath(dest)
                 class Dircleanup(object):
                     def __init__(self, dir_):
                         self.rmtree = shutil.rmtree
                         self.dir_ = dir_
                         os.mkdir(dir_)
                     def close(self):
                         self.dir_ = None
                     def __del__(self):
                         if self.dir_:
                             self.rmtree(self.dir_, True)
                 if opts['ssh']:
                     ui.setconfig("ui", "ssh", opts['ssh'])
                 if opts['remotecmd']:
                     ui.setconfig("ui", "remotecmd", opts['remotecmd'])
                 if not os.path.exists(source):
                     source = ui.expandpath(source)
                 d = Dircleanup(dest)
                 abspath = source
                 other = hg.repository(ui, source)
                 copy = False
                 if other.dev() != -1:
                     abspath = os.path.abspath(source)
                     if not opts['pull'] and not opts['rev']:
                         copy = True
                 if copy:
                     try:
                         # we use a lock here because if we race with commit, we
                         # can end up with extra data in the cloned revlogs that's
                         # not pointed to by changesets, thus causing verify to
                         # fail
                         l1 = other.lock()
                     except lock.LockException:
                         copy = False
                 if copy:
                     # we lock here to avoid premature writing to the target
                     os.mkdir(os.path.join(dest, ".hg"))
                     l2 = lock.lock(os.path.join(dest, ".hg", "lock"))
                     files = "data 00manifest.d 00manifest.i 00changelog.d 00changelog.i"
                     for f in files.split():
                         src = os.path.join(source, ".hg", f)
                         dst = os.path.join(dest, ".hg", f)
                         try:
                             util.copyfiles(src, dst)
                         except OSError, inst:
                             if inst.errno != errno.ENOENT:
                                 raise
                     repo = hg.repository(ui, dest)
                 else:
                     revs = None
                     if opts['rev']:
                         if not other.local():
                             error = _("clone -r not supported yet for remote repositories.")
                             raise util.Abort(error)
                         else:
                             revs = [other.lookup(rev) for rev in opts['rev']]
                     repo = hg.repository(ui, dest, create=1)
                     repo.pull(other, heads = revs)
                 f = repo.opener("hgrc", "w", text=True)
                 f.write("[paths]\n")
                 f.write("default = %s\n" % abspath)
                 f.close()
                 if not opts['noupdate']:
                     update(ui, repo)
                 d.close()
             def commit(ui, repo, *pats, **opts):
                 """commit the specified files or all outstanding changes
                 Commit changes to the given files into the repository.
                 If a list of files is omitted, all changes reported by "hg status"
                 will be commited.
                 The HGEDITOR or EDITOR environment variables are used to start an
                 editor to add a commit comment.
                 """
                 message = opts['message']
                 logfile = opts['logfile']
                 if message and logfile:
                     raise util.Abort(_('options --message and --logfile are mutually '
                                        'exclusive'))
                 if not message and logfile:
                     try:
                         if logfile == '-':
                             message = sys.stdin.read()
                         else:
                             message = open(logfile).read()
                     except IOError, inst:
                         raise util.Abort(_("can't read commit message '%s': %s") %
                                          (logfile, inst.strerror))
                 if opts['addremove']:
                     addremove(ui, repo, *pats, **opts)
                 fns, match, anypats = matchpats(repo, pats, opts)
                 if pats:
                     modified, added, removed, deleted, unknown = (
                         repo.changes(files=fns, match=match))
                     files = modified + added + removed
                 else:
                     files = []
                 try:
                     repo.commit(files, message, opts['user'], opts['date'], match)
                 except ValueError, inst:
                     raise util.Abort(str(inst))
             def docopy(ui, repo, pats, opts):
                 cwd = repo.getcwd()
                 errors = 0
                 copied = []
                 targets = {}
                 def okaytocopy(abs, rel, exact):
                     reasons = {'?': _('is not managed'),
                                'a': _('has been marked for add'),
                                'r': _('has been marked for remove')}
                     state = repo.dirstate.state(abs)
                     reason = reasons.get(state)
                     if reason:
                         if state == 'a':
                             origsrc = repo.dirstate.copied(abs)
                             if origsrc is not None:
                                 return origsrc
                         if exact:
                             ui.warn(_('%s: not copying - file %s\n') % (rel, reason))
                     else:
                         return abs
                 def copy(origsrc, abssrc, relsrc, target, exact):
                     abstarget = util.canonpath(repo.root, cwd, target)
                     reltarget = util.pathto(cwd, abstarget)
                     prevsrc = targets.get(abstarget)
                     if prevsrc is not None:
                         ui.warn(_('%s: not overwriting - %s collides with %s\n') %
                                 (reltarget, abssrc, prevsrc))
                         return
                     if (not opts['after'] and os.path.exists(reltarget) or
                         opts['after'] and repo.dirstate.state(abstarget) not in '?r'):
                         if not opts['force']:
                             ui.warn(_('%s: not overwriting - file exists\n') %
                                     reltarget)
                             return
                         if not opts['after']:
                             os.unlink(reltarget)
                     if opts['after']:
                         if not os.path.exists(reltarget):
                             return
                     else:
                         targetdir = os.path.dirname(reltarget) or '.'
                         if not os.path.isdir(targetdir):
                             os.makedirs(targetdir)
                         try:
                             shutil.copyfile(relsrc, reltarget)
                             shutil.copymode(relsrc, reltarget)
                         except shutil.Error, inst:
                             raise util.Abort(str(inst))
                         except IOError, inst:
                             if inst.errno == errno.ENOENT:
                                 ui.warn(_('%s: deleted in working copy\n') % relsrc)
                             else:
                                 ui.warn(_('%s: cannot copy - %s\n') %
                                         (relsrc, inst.strerror))
                                 errors += 1
                                 return
                     if ui.verbose or not exact:
                         ui.status(_('copying %s to %s\n') % (relsrc, reltarget))
                     targets[abstarget] = abssrc
                     repo.copy(origsrc, abstarget)
                     copied.append((abssrc, relsrc, exact))
                 def targetpathfn(pat, dest, srcs):
                     if os.path.isdir(pat):
                         abspfx = util.canonpath(repo.root, cwd, pat)
                         if destdirexists:
                             striplen = len(os.path.split(abspfx)[0])
                         else:
                             striplen = len(abspfx)
                         if striplen:
                             striplen += len(os.sep)
                         res = lambda p: os.path.join(dest, p[striplen:])
                     elif destdirexists:
                         res = lambda p: os.path.join(dest, os.path.basename(p))
                     else:
                         res = lambda p: dest
                     return res
                 def targetpathafterfn(pat, dest, srcs):
                     if util.patkind(pat, None)[0]:
                         # a mercurial pattern
                         res = lambda p: os.path.join(dest, os.path.basename(p))
                     else:
                         abspfx = util.canonpath(repo.root, cwd, pat)
                         if len(abspfx) < len(srcs[0][0]):
                             # A directory. Either the target path contains the last
                             # component of the source path or it does not.
                             def evalpath(striplen):
                                 score = 0
                                 for s in srcs:
                                     t = os.path.join(dest, s[0][striplen:])
                                     if os.path.exists(t):
                                         score += 1
                                 return score
                             striplen = len(abspfx)
                             if striplen:
                                 striplen += len(os.sep)
                             if os.path.isdir(os.path.join(dest, os.path.split(abspfx)[1])):
                                 score = evalpath(striplen)
                                 striplen1 = len(os.path.split(abspfx)[0])
                                 if striplen1:
                                     striplen1 += len(os.sep)
                                 if evalpath(striplen1) > score:
                                     striplen = striplen1
                             res = lambda p: os.path.join(dest, p[striplen:])
                         else:
                             # a file
                             if destdirexists:
                                 res = lambda p: os.path.join(dest, os.path.basename(p))
                             else:
                                 res = lambda p: dest
                     return res
                 pats = list(pats)
                 if not pats:
                     raise util.Abort(_('no source or destination specified'))
                 if len(pats) == 1:
                     raise util.Abort(_('no destination specified'))
                 dest = pats.pop()
                 destdirexists = os.path.isdir(dest)
                 if (len(pats) > 1 or util.patkind(pats[0], None)[0]) and not destdirexists:
                     raise util.Abort(_('with multiple sources, destination must be an '
                                      'existing directory'))
                 if opts['after']:
                     tfn = targetpathafterfn
                 else:
                     tfn = targetpathfn
                 copylist = []
                 for pat in pats:
                     srcs = []
                     for tag, abssrc, relsrc, exact in walk(repo, [pat], opts):
                         origsrc = okaytocopy(abssrc, relsrc, exact)
                         if origsrc:
                             srcs.append((origsrc, abssrc, relsrc, exact))
                     if not srcs:
                         continue
                     copylist.append((tfn(pat, dest, srcs), srcs))
                 if not copylist:
                     raise util.Abort(_('no files to copy'))
                 for targetpath, srcs in copylist:
                     for origsrc, abssrc, relsrc, exact in srcs:
                         copy(origsrc, abssrc, relsrc, targetpath(abssrc), exact)
                 if errors:
                     ui.warn(_('(consider using --after)\n'))
                 return errors, copied
             def copy(ui, repo, *pats, **opts):
                 """mark files as copied for the next commit
                 Mark dest as having copies of source files.  If dest is a
                 directory, copies are put in that directory.  If dest is a file,
                 there can only be one source.
                 By default, this command copies the contents of files as they
                 stand in the working directory.  If invoked with --after, the
                 operation is recorded, but no copying is performed.
                 This command takes effect in the next commit.
                 NOTE: This command should be treated as experimental. While it
                 should properly record copied files, this information is not yet
                 fully used by merge, nor fully reported by log.
                 """
                 errs, copied = docopy(ui, repo, pats, opts)
                 return errs
             def debugancestor(ui, index, rev1, rev2):
                 """find the ancestor revision of two revisions in a given index"""
                 r = revlog.revlog(util.opener(os.getcwd()), index, "")
                 a = r.ancestor(r.lookup(rev1), r.lookup(rev2))
                 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
             def debugrebuildstate(ui, repo, rev=None):
                 """rebuild the dirstate as it would look like for the given revision"""
                 if not rev:
                     rev = repo.changelog.tip()
                 else:
                     rev = repo.lookup(rev)
                 change = repo.changelog.read(rev)
                 n = change[0]
                 files = repo.manifest.readflags(n)
                 wlock = repo.wlock()
                 repo.dirstate.rebuild(rev, files.iteritems())
             def debugcheckstate(ui, repo):
                 """validate the correctness of the current dirstate"""
                 parent1, parent2 = repo.dirstate.parents()
                 repo.dirstate.read()
                 dc = repo.dirstate.map
                 keys = dc.keys()
                 keys.sort()
                 m1n = repo.changelog.read(parent1)[0]
                 m2n = repo.changelog.read(parent2)[0]
                 m1 = repo.manifest.read(m1n)
                 m2 = repo.manifest.read(m2n)
                 errors = 0
                 for f in dc:
                     state = repo.dirstate.state(f)
                     if state in "nr" and f not in m1:
                         ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
                         errors += 1
                     if state in "a" and f in m1:
                         ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
                         errors += 1
                     if state in "m" and f not in m1 and f not in m2:
                         ui.warn(_("%s in state %s, but not in either manifest\n") %
                                 (f, state))
                         errors += 1
                 for f in m1:
                     state = repo.dirstate.state(f)
                     if state not in "nrm":
                         ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
                         errors += 1
                 if errors:
                     error = _(".hg/dirstate inconsistent with current parent's manifest")
                     raise util.Abort(error)
             def debugconfig(ui):
                 """show combined config settings from all hgrc files"""
                 try:
                     repo = hg.repository(ui)
                 except hg.RepoError:
                     pass
                 for section, name, value in ui.walkconfig():
                     ui.write('%s.%s=%s\n' % (section, name, value))
             def debugsetparents(ui, repo, rev1, rev2=None):
                 """manually set the parents of the current working directory
                 This is useful for writing repository conversion tools, but should
                 be used with care.
                 """
                 if not rev2:
                     rev2 = hex(nullid)
                 repo.dirstate.setparents(repo.lookup(rev1), repo.lookup(rev2))
             def debugstate(ui, repo):
                 """show the contents of the current dirstate"""
                 repo.dirstate.read()
                 dc = repo.dirstate.map
                 keys = dc.keys()
                 keys.sort()
                 for file_ in keys:
                     ui.write("%c %3o %10d %s %s\n"
                              % (dc[file_][0], dc[file_][1] & 0777, dc[file_][2],
                                 time.strftime("%x %X",
                                               time.localtime(dc[file_][3])), file_))
                 for f in repo.dirstate.copies:
                     ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copies[f], f))
             def debugdata(ui, file_, rev):
                 """dump the contents of an data file revision"""
                 r = revlog.revlog(util.opener(os.getcwd()), file_[:-2] + ".i", file_)
                 try:
                     ui.write(r.revision(r.lookup(rev)))
                 except KeyError:
                     raise util.Abort(_('invalid revision identifier %s'), rev)
             def debugindex(ui, file_):
                 """dump the contents of an index file"""
                 r = revlog.revlog(util.opener(os.getcwd()), file_, "")
                 ui.write("   rev    offset  length   base linkrev" +
                          " nodeid       p1           p2\n")
                 for i in range(r.count()):
                     e = r.index[i]
                     ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
                             i, e[0], e[1], e[2], e[3],
                         short(e[6]), short(e[4]), short(e[5])))
             def debugindexdot(ui, file_):
                 """dump an index DAG as a .dot file"""
                 r = revlog.revlog(util.opener(os.getcwd()), file_, "")
                 ui.write("digraph G {\n")
                 for i in range(r.count()):
                     e = r.index[i]
                     ui.write("\t%d -> %d\n" % (r.rev(e[4]), i))
                     if e[5] != nullid:
                         ui.write("\t%d -> %d\n" % (r.rev(e[5]), i))
                 ui.write("}\n")
             def debugrename(ui, repo, file, rev=None):
                 """dump rename information"""
                 r = repo.file(relpath(repo, [file])[0])
                 if rev:
                     try:
                         # assume all revision numbers are for changesets
                         n = repo.lookup(rev)
                         change = repo.changelog.read(n)
                         m = repo.manifest.read(change[0])
                         n = m[relpath(repo, [file])[0]]
                     except (hg.RepoError, KeyError):
                         n = r.lookup(rev)
                 else:
                     n = r.tip()
                 m = r.renamed(n)
                 if m:
                     ui.write(_("renamed from %s:%s\n") % (m[0], hex(m[1])))
                 else:
                     ui.write(_("not renamed\n"))
             def debugwalk(ui, repo, *pats, **opts):
                 """show how files match on given patterns"""
                 items = list(walk(repo, pats, opts))
                 if not items:
                     return
                 fmt = '%%s  %%-%ds  %%-%ds  %%s' % (
                     max([len(abs) for (src, abs, rel, exact) in items]),
                     max([len(rel) for (src, abs, rel, exact) in items]))
                 for src, abs, rel, exact in items:
                     line = fmt % (src, abs, rel, exact and 'exact' or '')
                     ui.write("%s\n" % line.rstrip())
             def diff(ui, repo, *pats, **opts):
                 """diff repository (or selected files)
                 Show differences between revisions for the specified files.
                 Differences between files are shown using the unified diff format.
                 When two revision arguments are given, then changes are shown
                 between those revisions. If only one revision is specified then
                 that revision is compared to the working directory, and, when no
                 revisions are specified, the working directory files are compared
                 to its parent.
                 Without the -a option, diff will avoid generating diffs of files
                 it detects as binary. With -a, diff will generate a diff anyway,
                 probably with undesirable results.
                 """
                 node1, node2 = None, None
                 revs = [repo.lookup(x) for x in opts['rev']]
                 if len(revs) > 0:
                     node1 = revs[0]
                 if len(revs) > 1:
                     node2 = revs[1]
                 if len(revs) > 2:
                     raise util.Abort(_("too many revisions to diff"))
                 fns, matchfn, anypats = matchpats(repo, pats, opts)
                 dodiff(sys.stdout, ui, repo, node1, node2, fns, match=matchfn,
                        text=opts['text'], opts=opts)
             def doexport(ui, repo, changeset, seqno, total, revwidth, opts):
                 node = repo.lookup(changeset)
                 parents = [p for p in repo.changelog.parents(node) if p != nullid]
                 if opts['switch_parent']:
                     parents.reverse()
                 prev = (parents and parents[0]) or nullid
                 change = repo.changelog.read(node)
                 fp = make_file(repo, repo.changelog, opts['output'],
                                node=node, total=total, seqno=seqno,
                                revwidth=revwidth)
                 if fp != sys.stdout:
                     ui.note("%s\n" % fp.name)
                 fp.write("# HG changeset patch\n")
                 fp.write("# User %s\n" % change[1])
                 fp.write("# Node ID %s\n" % hex(node))
                 fp.write("# Parent  %s\n" % hex(prev))
                 if len(parents) > 1:
                     fp.write("# Parent  %s\n" % hex(parents[1]))
                 fp.write(change[4].rstrip())
                 fp.write("\n\n")
                 dodiff(fp, ui, repo, prev, node, text=opts['text'])
                 if fp != sys.stdout:
                     fp.close()
             def export(ui, repo, *changesets, **opts):
                 """dump the header and diffs for one or more changesets
                 Print the changeset header and diffs for one or more revisions.
                 The information shown in the changeset header is: author,
                 changeset hash, parent and commit comment.
                 Output may be to a file, in which case the name of the file is
                 given using a format string.  The formatting rules are as follows:
                 %%   literal "%" character
                 %H   changeset hash (40 bytes of hexadecimal)
                 %N   number of patches being generated
                 %R   changeset revision number
                 %b   basename of the exporting repository
                 %h   short-form changeset hash (12 bytes of hexadecimal)
                 %n   zero-padded sequence number, starting at 1
                 %r   zero-padded changeset revision number
                 Without the -a option, export will avoid generating diffs of files
                 it detects as binary. With -a, export will generate a diff anyway,
                 probably with undesirable results.
                 With the --switch-parent option, the diff will be against the second
                 parent. It can be useful to review a merge.
                 """
                 if not changesets:
                     raise util.Abort(_("export requires at least one changeset"))
                 seqno = 0
                 revs = list(revrange(ui, repo, changesets))
                 total = len(revs)
                 revwidth = max(map(len, revs))
                 msg = len(revs) > 1 and _("Exporting patches:\n") or _("Exporting patch:\n")
                 ui.note(msg)
                 for cset in revs:
                     seqno += 1
                     doexport(ui, repo, cset, seqno, total, revwidth, opts)
             def forget(ui, repo, *pats, **opts):
                 """don't add the specified files on the next commit
                 Undo an 'hg add' scheduled for the next commit.
                 """
                 forget = []
                 for src, abs, rel, exact in walk(repo, pats, opts):
                     if repo.dirstate.state(abs) == 'a':
                         forget.append(abs)
                         if ui.verbose or not exact:
                             ui.status(_('forgetting %s\n') % ((pats and rel) or abs))
                 repo.forget(forget)
             def grep(ui, repo, pattern, *pats, **opts):
                 """search for a pattern in specified files and revisions
                 Search revisions of files for a regular expression.
                 This command behaves differently than Unix grep.  It only accepts
                 Python/Perl regexps.  It searches repository history, not the
                 working directory.  It always prints the revision number in which
                 a match appears.
                 By default, grep only prints output for the first revision of a
                 file in which it finds a match.  To get it to print every revision
                 that contains a change in match status ("-" for a match that
                 becomes a non-match, or "+" for a non-match that becomes a match),
                 use the --all flag.
                 """
                 reflags = 0
                 if opts['ignore_case']:
                     reflags |= re.I
                 regexp = re.compile(pattern, reflags)
                 sep, eol = ':', '\n'
                 if opts['print0']:
                     sep = eol = '\0'
                 fcache = {}
                 def getfile(fn):
                     if fn not in fcache:
                         fcache[fn] = repo.file(fn)
                     return fcache[fn]
                 def matchlines(body):
                     begin = 0
                     linenum = 0
                     while True:
                         match = regexp.search(body, begin)
                         if not match:
                             break
                         mstart, mend = match.span()
                         linenum += body.count('\n', begin, mstart) + 1
                         lstart = body.rfind('\n', begin, mstart) + 1 or begin
                         lend = body.find('\n', mend)
                         yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
                         begin = lend + 1
                 class linestate(object):
                     def __init__(self, line, linenum, colstart, colend):
                         self.line = line
                         self.linenum = linenum
                         self.colstart = colstart
                         self.colend = colend
                     def __eq__(self, other):
                         return self.line == other.line
                     def __hash__(self):
                         return hash(self.line)
                 matches = {}
                 def grepbody(fn, rev, body):
                     matches[rev].setdefault(fn, {})
                     m = matches[rev][fn]
                     for lnum, cstart, cend, line in matchlines(body):
                         s = linestate(line, lnum, cstart, cend)
                         m[s] = s
                 # FIXME: prev isn't used, why ?
                 prev = {}
                 ucache = {}
                 def display(fn, rev, states, prevstates):
                     diff = list(sets.Set(states).symmetric_difference(sets.Set(prevstates)))
                     diff.sort(lambda x, y: cmp(x.linenum, y.linenum))
                     counts = {'-': 0, '+': 0}
                     filerevmatches = {}
                     for l in diff:
                         if incrementing or not opts['all']:
                             change = ((l in prevstates) and '-') or '+'
                             r = rev
                         else:
                             change = ((l in states) and '-') or '+'
                             r = prev[fn]
                         cols = [fn, str(rev)]
                         if opts['line_number']:
                             cols.append(str(l.linenum))
                         if opts['all']:
                             cols.append(change)
                         if opts['user']:
                             cols.append(trimuser(ui, getchange(rev)[1], rev,
                                                               ucache))
                         if opts['files_with_matches']:
                             c = (fn, rev)
                             if c in filerevmatches:
                                 continue
                             filerevmatches[c] = 1
                         else:
                             cols.append(l.line)
                         ui.write(sep.join(cols), eol)
                         counts[change] += 1
                     return counts['+'], counts['-']
                 fstate = {}
                 skip = {}
                 changeiter, getchange, matchfn = walkchangerevs(ui, repo, pats, opts)
                 count = 0
                 incrementing = False
                 for st, rev, fns in changeiter:
                     if st == 'window':
                         incrementing = rev
                         matches.clear()
                     elif st == 'add':
                         change = repo.changelog.read(repo.lookup(str(rev)))
                         mf = repo.manifest.read(change[0])
                         matches[rev] = {}
                         for fn in fns:
                             if fn in skip:
                                 continue
                             fstate.setdefault(fn, {})
                             try:
                                 grepbody(fn, rev, getfile(fn).read(mf[fn]))
                             except KeyError:
                                 pass
                     elif st == 'iter':
                         states = matches[rev].items()
                         states.sort()
                         for fn, m in states:
                             if fn in skip:
                                 continue
                             if incrementing or not opts['all'] or fstate[fn]:
                                 pos, neg = display(fn, rev, m, fstate[fn])
                                 count += pos + neg
                                 if pos and not opts['all']:
                                     skip[fn] = True
                             fstate[fn] = m
                             prev[fn] = rev
                 if not incrementing:
                     fstate = fstate.items()
                     fstate.sort()
                     for fn, state in fstate:
                         if fn in skip:
                             continue
                         display(fn, rev, {}, state)
                 return (count == 0 and 1) or 0
             def heads(ui, repo, **opts):
                 """show current repository heads
                 Show all repository head changesets.
                 Repository "heads" are changesets that don't have children
                 changesets. They are where development generally takes place and
                 are the usual targets for update and merge operations.
                 """
                 if opts['rev']:
                     heads = repo.heads(repo.lookup(opts['rev']))
                 else:
                     heads = repo.heads()
                 br = None
                 if opts['branches']:
                     br = repo.branchlookup(heads)
                 for n in heads:
                     show_changeset(ui, repo, changenode=n, brinfo=br)
             def identify(ui, repo):
                 """print information about the working copy
                 Print a short summary of the current state of the repo.
                 This summary identifies the repository state using one or two parent
                 hash identifiers, followed by a "+" if there are uncommitted changes
                 in the working directory, followed by a list of tags for this revision.
                 """
                 parents = [p for p in repo.dirstate.parents() if p != nullid]
                 if not parents:
                     ui.write(_("unknown\n"))
                     return
                 hexfunc = ui.verbose and hex or short
                 modified, added, removed, deleted, unknown = repo.changes()
                 output = ["%s%s" %
                           ('+'.join([hexfunc(parent) for parent in parents]),
                           (modified or added or removed or deleted) and "+" or "")]
                 if not ui.quiet:
                     # multiple tags for a single parent separated by '/'
                     parenttags = ['/'.join(tags)
                                   for tags in map(repo.nodetags, parents) if tags]
                     # tags for multiple parents separated by ' + '
                     if parenttags:
                         output.append(' + '.join(parenttags))
                 ui.write("%s\n" % ' '.join(output))
             def import_(ui, repo, patch1, *patches, **opts):
                 """import an ordered set of patches
                 Import a list of patches and commit them individually.
                 If there are outstanding changes in the working directory, import
                 will abort unless given the -f flag.
                 If a patch looks like a mail message (its first line starts with
                 "From " or looks like an RFC822 header), it will not be applied
                 unless the -f option is used.  The importer neither parses nor
                 discards mail headers, so use -f only to override the "mailness"
                 safety check, not to import a real mail message.
                 """
                 patches = (patch1,) + patches
                 if not opts['force']:
                     modified, added, removed, deleted, unknown = repo.changes()
                     if modified or added or removed or deleted:
                         raise util.Abort(_("outstanding uncommitted changes"))
                 d = opts["base"]
                 strip = opts["strip"]
                 mailre = re.compile(r'(?:From |[\w-]+:)')
                 # attempt to detect the start of a patch
                 # (this heuristic is borrowed from quilt)
                 diffre = re.compile(r'(?:Index:[ \t]|diff[ \t]|RCS file: |' +
                                     'retrieving revision [0-9]+(\.[0-9]+)*$|' +
                                     '(---|\*\*\*)[ \t])')
                 for patch in patches:
                     ui.status(_("applying %s\n") % patch)
                     pf = os.path.join(d, patch)
                     message = []
                     user = None
                     hgpatch = False
                     for line in file(pf):
                         line = line.rstrip()
                         if (not message and not hgpatch and
                                mailre.match(line) and not opts['force']):
                             if len(line) > 35:
                                 line = line[:32] + '...'
                             raise util.Abort(_('first line looks like a '
                                                'mail header: ') + line)
                         if diffre.match(line):
                             break
                         elif hgpatch:
                             # parse values when importing the result of an hg export
                             if line.startswith("# User "):
                                 user = line[7:]
                                 ui.debug(_('User: %s\n') % user)
                             elif not line.startswith("# ") and line:
                                 message.append(line)
                                 hgpatch = False
                         elif line == '# HG changeset patch':
                             hgpatch = True
                             message = []       # We may have collected garbage
                         else:
                             message.append(line)
                     # make sure message isn't empty
                     if not message:
                         message = _("imported patch %s\n") % patch
                     else:
                         message = "%s\n" % '\n'.join(message)
                     ui.debug(_('message:\n%s\n') % message)
                     files = util.patch(strip, pf, ui)
                     if len(files) > 0:
                         addremove(ui, repo, *files)
                     repo.commit(files, message, user)
             def incoming(ui, repo, source="default", **opts):
                 """show new changesets found in source
                 Show new changesets found in the specified repo or the default
                 pull repo. These are the changesets that would be pulled if a pull
                 was requested.
                 Currently only local repositories are supported.
                 """
                 source = ui.expandpath(source, repo.root)
                 other = hg.repository(ui, source)
                 if not other.local():
                     raise util.Abort(_("incoming doesn't work for remote repositories yet"))
                 o = repo.findincoming(other)
                 if not o:
                     return
                 o = other.changelog.nodesbetween(o)[0]
                 if opts['newest_first']:
                     o.reverse()
                 for n in o:
                     parents = [p for p in other.changelog.parents(n) if p != nullid]
                     if opts['no_merges'] and len(parents) == 2:
                         continue
                     show_changeset(ui, other, changenode=n)
                     if opts['patch']:
                         prev = (parents and parents[0]) or nullid
                         dodiff(ui, ui, other, prev, n)
                         ui.write("\n")
             def init(ui, dest="."):
                 """create a new repository in the given directory
                 Initialize a new repository in the given directory.  If the given
                 directory does not exist, it is created.
                 If no directory is given, the current directory is used.
                 """
                 if not os.path.exists(dest):
                     os.mkdir(dest)
                 hg.repository(ui, dest, create=1)
             def locate(ui, repo, *pats, **opts):
                 """locate files matching specific patterns
                 Print all files under Mercurial control whose names match the
                 given patterns.
                 This command searches the current directory and its
                 subdirectories.  To search an entire repository, move to the root
                 of the repository.
                 If no patterns are given to match, this command prints all file
                 names.
                 If you want to feed the output of this command into the "xargs"
                 command, use the "-0" option to both this command and "xargs".
                 This will avoid the problem of "xargs" treating single filenames
                 that contain white space as multiple filenames.
                 """
                 end = opts['print0'] and '\0' or '\n'
                 rev = opts['rev']
                 if rev:
                     node = repo.lookup(rev)
                 else:
                     node = None
                 for src, abs, rel, exact in walk(repo, pats, opts, node=node,
                                                  head='(?:.*/|)'):
                     if not node and repo.dirstate.state(abs) == '?':
                         continue
                     if opts['fullpath']:
                         ui.write(os.path.join(repo.root, abs), end)
                     else:
                         ui.write(((pats and rel) or abs), end)
             def log(ui, repo, *pats, **opts):
                 """show revision history of entire repository or files
                 Print the revision history of the specified files or the entire project.
                 By default this command outputs: changeset id and hash, tags,
                 non-trivial parents, user, date and time, and a summary for each
                 commit. When the -v/--verbose switch is used, the list of changed
                 files and full commit message is shown.
                 """
                 class dui(object):
                     # Implement and delegate some ui protocol.  Save hunks of
                     # output for later display in the desired order.
                     def __init__(self, ui):
                         self.ui = ui
                         self.hunk = {}
                     def bump(self, rev):
                         self.rev = rev
                         self.hunk[rev] = []
                     def note(self, *args):
                         if self.verbose:
                             self.write(*args)
                     def status(self, *args):
                         if not self.quiet:
                             self.write(*args)
                     def write(self, *args):
                         self.hunk[self.rev].append(args)
                     def debug(self, *args):
                         if self.debugflag:
                             self.write(*args)
                     def __getattr__(self, key):
                         return getattr(self.ui, key)
                 changeiter, getchange, matchfn = walkchangerevs(ui, repo, pats, opts)
                 if opts['limit']:
                     try:
                         limit = int(opts['limit'])
                     except ValueError:
                         raise util.Abort(_('limit must be a positive integer'))
                     if limit <= 0: raise util.Abort(_('limit must be positive'))
                 else:
                     limit = sys.maxint
                 count = 0
                 for st, rev, fns in changeiter:
                     if st == 'window':
                         du = dui(ui)
                     elif st == 'add':
                         du.bump(rev)
                         changenode = repo.changelog.node(rev)
                         parents = [p for p in repo.changelog.parents(changenode)
                                    if p != nullid]
                         if opts['no_merges'] and len(parents) == 2:
                             continue
                         if opts['only_merges'] and len(parents) != 2:
                             continue
                         if opts['keyword']:
                             changes = getchange(rev)
                             miss = 0
                             for k in [kw.lower() for kw in opts['keyword']]:
                                 if not (k in changes[1].lower() or
                                         k in changes[4].lower() or
                                         k in " ".join(changes[3][:20]).lower()):
                                     miss = 1
                                     break
                             if miss:
                                 continue
                         br = None
                         if opts['branches']:
                             br = repo.branchlookup([repo.changelog.node(rev)])
                         show_changeset(du, repo, rev, brinfo=br)
                         if opts['patch']:
                             prev = (parents and parents[0]) or nullid
                             dodiff(du, du, repo, prev, changenode, match=matchfn)
                             du.write("\n\n")
                     elif st == 'iter':
                         if count == limit: break
                         if du.hunk[rev]:
                             count += 1
                             for args in du.hunk[rev]:
                                 ui.write(*args)
             def manifest(ui, repo, rev=None):
                 """output the latest or given revision of the project manifest
                 Print a list of version controlled files for the given revision.
                 The manifest is the list of files being version controlled. If no revision
                 is given then the tip is used.
                 """
                 if rev:
                     try:
                         # assume all revision numbers are for changesets
                         n = repo.lookup(rev)
                         change = repo.changelog.read(n)
                         n = change[0]
                     except hg.RepoError:
                         n = repo.manifest.lookup(rev)
                 else:
                     n = repo.manifest.tip()
                 m = repo.manifest.read(n)
                 mf = repo.manifest.readflags(n)
                 files = m.keys()
                 files.sort()
                 for f in files:
                     ui.write("%40s %3s %s\n" % (hex(m[f]), mf[f] and "755" or "644", f))
             def outgoing(ui, repo, dest="default-push", **opts):
                 """show changesets not found in destination
                 Show changesets not found in the specified destination repo or the
                 default push repo. These are the changesets that would be pushed
                 if a push was requested.
+                See pull for valid source format details.
                 """
                 dest = ui.expandpath(dest, repo.root)
                 other = hg.repository(ui, dest)
                 o = repo.findoutgoing(other)
                 o = repo.changelog.nodesbetween(o)[0]
                 if opts['newest_first']:
                     o.reverse()
                 for n in o:
                     parents = [p for p in repo.changelog.parents(n) if p != nullid]
                     if opts['no_merges'] and len(parents) == 2:
                         continue
                     show_changeset(ui, repo, changenode=n)
                     if opts['patch']:
                         prev = (parents and parents[0]) or nullid
                         dodiff(ui, ui, repo, prev, n)
                         ui.write("\n")
             def parents(ui, repo, rev=None, branches=None):
                 """show the parents of the working dir or revision
                 Print the working directory's parent revisions.
                 """
                 if rev:
                     p = repo.changelog.parents(repo.lookup(rev))
                 else:
                     p = repo.dirstate.parents()
                 br = None
                 if branches is not None:
                     br = repo.branchlookup(p)
                 for n in p:
                     if n != nullid:
                         show_changeset(ui, repo, changenode=n, brinfo=br)
             def paths(ui, search=None):
                 """show definition of symbolic path names
                 Show definition of symbolic path name NAME. If no name is given, show
                 definition of available names.
                 Path names are defined in the [paths] section of /etc/mercurial/hgrc
                 and $HOME/.hgrc.  If run inside a repository, .hg/hgrc is used, too.
                 """
                 try:
                     repo = hg.repository(ui=ui)
                 except hg.RepoError:
                     pass
                 if search:
                     for name, path in ui.configitems("paths"):
                         if name == search:
                             ui.write("%s\n" % path)
                             return
                     ui.warn(_("not found!\n"))
                     return 1
                 else:
                     for name, path in ui.configitems("paths"):
                         ui.write("%s = %s\n" % (name, path))
             def pull(ui, repo, source="default", **opts):
                 """pull changes from the specified source
                 Pull changes from a remote repository to a local one.
                 This finds all changes from the repository at the specified path
                 or URL and adds them to the local repository. By default, this
                 does not update the copy of the project in the working directory.
                 Valid URLs are of the form:
                   local/filesystem/path
                   http://[user@]host[:port][/path]
                   https://[user@]host[:port][/path]
                   ssh://[user@]host[:port][/path]
                 SSH requires an accessible shell account on the destination machine
                 and a copy of hg in the remote path.  With SSH, paths are relative
                 to the remote user's home directory by default; use two slashes at
                 the start of a path to specify it as relative to the filesystem root.
                 """
                 source = ui.expandpath(source, repo.root)
                 ui.status(_('pulling from %s\n') % (source))
                 if opts['ssh']:
                     ui.setconfig("ui", "ssh", opts['ssh'])
                 if opts['remotecmd']:
                     ui.setconfig("ui", "remotecmd", opts['remotecmd'])
                 other = hg.repository(ui, source)
                 revs = None
                 if opts['rev'] and not other.local():
                     raise util.Abort(_("pull -r doesn't work for remote repositories yet"))
                 elif opts['rev']:
                     revs = [other.lookup(rev) for rev in opts['rev']]
                 r = repo.pull(other, heads=revs)
                 if not r:
                     if opts['update']:
                         return update(ui, repo)
                     else:
                         ui.status(_("(run 'hg update' to get a working copy)\n"))
                 return r
             def push(ui, repo, dest="default-push", **opts):
                 """push changes to the specified destination
                 Push changes from the local repository to the given destination.
                 This is the symmetrical operation for pull. It helps to move
                 changes from the current repository to a different one. If the
                 destination is local this is identical to a pull in that directory
                 from the current one.
                 By default, push will refuse to run if it detects the result would
                 increase the number of remote heads. This generally indicates the
                 the client has forgotten to sync and merge before pushing.
                 Valid URLs are of the form:
                   local/filesystem/path
                   ssh://[user@]host[:port][/path]
                 SSH requires an accessible shell account on the destination
                 machine and a copy of hg in the remote path.
                 """
                 dest = ui.expandpath(dest, repo.root)
                 ui.status('pushing to %s\n' % (dest))
                 if opts['ssh']:
                     ui.setconfig("ui", "ssh", opts['ssh'])
                 if opts['remotecmd']:
                     ui.setconfig("ui", "remotecmd", opts['remotecmd'])
                 other = hg.repository(ui, dest)
                 revs = None
                 if opts['rev']:
                     revs = [repo.lookup(rev) for rev in opts['rev']]
                 r = repo.push(other, opts['force'], revs=revs)
                 return r
             def rawcommit(ui, repo, *flist, **rc):
-                """raw commit interface (DEPRECATED)
+                """raw commit interface
+                (DEPRECATED)
                 Lowlevel commit, for use in helper scripts.
                 This command is not intended to be used by normal users, as it is
                 primarily useful for importing from other SCMs.
                 This command is now deprecated and will be removed in a future
                 release, please use debugsetparents and commit instead.
                 """
                 ui.warn(_("(the rawcommit command is deprecated)\n"))
                 message = rc['message']
                 if not message and rc['logfile']:
                     try:
                         message = open(rc['logfile']).read()
                     except IOError:
                         pass
                 if not message and not rc['logfile']:
                     raise util.Abort(_("missing commit message"))
                 files = relpath(repo, list(flist))
                 if rc['files']:
                     files += open(rc['files']).read().splitlines()
                 rc['parent'] = map(repo.lookup, rc['parent'])
                 try:
                     repo.rawcommit(files, message, rc['user'], rc['date'], *rc['parent'])
                 except ValueError, inst:
                     raise util.Abort(str(inst))
             def recover(ui, repo):
                 """roll back an interrupted transaction
                 Recover from an interrupted commit or pull.
                 This command tries to fix the repository status after an interrupted
                 operation. It should only be necessary when Mercurial suggests it.
                 """
                 if repo.recover():
                     return repo.verify()
                 return False
             def remove(ui, repo, pat, *pats, **opts):
                 """remove the specified files on the next commit
                 Schedule the indicated files for removal from the repository.
                 This command schedules the files to be removed at the next commit.
                 This only removes files from the current branch, not from the
                 entire project history.  If the files still exist in the working
                 directory, they will be deleted from it.
                 """
                 names = []
                 def okaytoremove(abs, rel, exact):
                     modified, added, removed, deleted, unknown = repo.changes(files=[abs])
                     reason = None
                     if modified:
                         reason = _('is modified')
                     elif added:
                         reason = _('has been marked for add')
                     elif unknown:
                         reason = _('is not managed')
                     if reason:
                         if exact:
                             ui.warn(_('not removing %s: file %s\n') % (rel, reason))
                     else:
                         return True
                 for src, abs, rel, exact in walk(repo, (pat,) + pats, opts):
                     if okaytoremove(abs, rel, exact):
                         if ui.verbose or not exact:
                             ui.status(_('removing %s\n') % rel)
                         names.append(abs)
                 repo.remove(names, unlink=True)
             def rename(ui, repo, *pats, **opts):
                 """rename files; equivalent of copy + remove
                 Mark dest as copies of sources; mark sources for deletion.  If
                 dest is a directory, copies are put in that directory.  If dest is
                 a file, there can only be one source.
                 By default, this command copies the contents of files as they
                 stand in the working directory.  If invoked with --after, the
                 operation is recorded, but no copying is performed.
                 This command takes effect in the next commit.
                 NOTE: This command should be treated as experimental. While it
                 should properly record rename files, this information is not yet
                 fully used by merge, nor fully reported by log.
                 """
                 errs, copied = docopy(ui, repo, pats, opts)
                 names = []
                 for abs, rel, exact in copied:
                     if ui.verbose or not exact:
                         ui.status(_('removing %s\n') % rel)
                     names.append(abs)
                 repo.remove(names, unlink=True)
                 return errs
             def revert(ui, repo, *pats, **opts):
                 """revert modified files or dirs back to their unmodified states
-                Revert any uncommitted modifications made to the named files or
+                In its default mode, it reverts any uncommitted modifications made
-                directories.  This restores the contents of the affected files to
+                to the named files or directories.  This restores the contents of
-                an unmodified state.
+                the affected files to an unmodified state.
+                Using the -r option, it reverts the given files or directories to
+                their state as of an earlier revision.  This can be helpful to "roll
+                back" some or all of a change that should not have been committed.
+                Revert modifies the working directory.  It does not commit any
+                changes, or change the parent of the current working directory.
                 If a file has been deleted, it is recreated.  If the executable
                 mode of a file was changed, it is reset.
                 If names are given, all files matching the names are reverted.
                 If no arguments are given, all files in the repository are reverted.
                 """
                 node = opts['rev'] and repo.lookup(opts['rev']) or \
                        repo.dirstate.parents()[0]
                 files, choose, anypats = matchpats(repo, pats, opts)
                 modified, added, removed, deleted, unknown = repo.changes(match=choose)
                 repo.forget(added)
                 repo.undelete(removed)
                 return repo.update(node, False, True, choose, False)
             def root(ui, repo):
                 """print the root (top) of the current working dir
                 Print the root directory of the current repository.
                 """
                 ui.write(repo.root + "\n")
             def serve(ui, repo, **opts):
                 """export the repository via HTTP
                 Start a local HTTP repository browser and pull server.
                 By default, the server logs accesses to stdout and errors to
                 stderr.  Use the "-A" and "-E" options to log to files.
                 """
                 if opts["stdio"]:
                     fin, fout = sys.stdin, sys.stdout
                     sys.stdout = sys.stderr
                     # Prevent insertion/deletion of CRs
                     util.set_binary(fin)
                     util.set_binary(fout)
                     def getarg():
                         argline = fin.readline()[:-1]
                         arg, l = argline.split()
                         val = fin.read(int(l))
                         return arg, val
                     def respond(v):
                         fout.write("%d\n" % len(v))
                         fout.write(v)
                         fout.flush()
                     lock = None
                     while 1:
                         cmd = fin.readline()[:-1]
                         if cmd == '':
                             return
                         if cmd == "heads":
                             h = repo.heads()
                             respond(" ".join(map(hex, h)) + "\n")
                         if cmd == "lock":
                             lock = repo.lock()
                             respond("")
                         if cmd == "unlock":
                             if lock:
                                 lock.release()
                             lock = None
                             respond("")
                         elif cmd == "branches":
                             arg, nodes = getarg()
                             nodes = map(bin, nodes.split(" "))
                             r = []
                             for b in repo.branches(nodes):
                                 r.append(" ".join(map(hex, b)) + "\n")
                             respond("".join(r))
                         elif cmd == "between":
                             arg, pairs = getarg()
                             pairs = [map(bin, p.split("-")) for p in pairs.split(" ")]
                             r = []
                             for b in repo.between(pairs):
                                 r.append(" ".join(map(hex, b)) + "\n")
                             respond("".join(r))
                         elif cmd == "changegroup":
                             nodes = []
                             arg, roots = getarg()
                             nodes = map(bin, roots.split(" "))
                             cg = repo.changegroup(nodes, 'serve')
                             while 1:
                                 d = cg.read(4096)
                                 if not d:
                                     break
                                 fout.write(d)
                             fout.flush()
                         elif cmd == "addchangegroup":
                             if not lock:
                                 respond("not locked")
                                 continue
                             respond("")
                             r = repo.addchangegroup(fin)
                             respond("")
                 optlist = "name templates style address port ipv6 accesslog errorlog"
                 for o in optlist.split():
                     if opts[o]:
                         ui.setconfig("web", o, opts[o])
                 if opts['daemon'] and not opts['daemon_pipefds']:
                     rfd, wfd = os.pipe()
                     args = sys.argv[:]
                     args.append('--daemon-pipefds=%d,%d' % (rfd, wfd))
                     pid = os.spawnvp(os.P_NOWAIT | getattr(os, 'P_DETACH', 0),
                                      args[0], args)
                     os.close(wfd)
                     os.read(rfd, 1)
                     os._exit(0)
                 try:
                     httpd = hgweb.create_server(repo)
                 except socket.error, inst:
                     raise util.Abort(_('cannot start server: ') + inst.args[1])
                 if ui.verbose:
                     addr, port = httpd.socket.getsockname()
                     if addr == '0.0.0.0':
                         addr = socket.gethostname()
                     else:
                         try:
                             addr = socket.gethostbyaddr(addr)[0]
                         except socket.error:
                             pass
                     if port != 80:
                         ui.status(_('listening at http://%s:%d/\n') % (addr, port))
                     else:
                         ui.status(_('listening at http://%s/\n') % addr)
                 if opts['pid_file']:
                     fp = open(opts['pid_file'], 'w')
                     fp.write(str(os.getpid()))
                     fp.close()
                 if opts['daemon_pipefds']:
                     rfd, wfd = [int(x) for x in opts['daemon_pipefds'].split(',')]
                     os.close(rfd)
                     os.write(wfd, 'y')
                     os.close(wfd)
                     sys.stdout.flush()
                     sys.stderr.flush()
                     fd = os.open(util.nulldev, os.O_RDWR)
                     if fd != 0: os.dup2(fd, 0)
                     if fd != 1: os.dup2(fd, 1)
                     if fd != 2: os.dup2(fd, 2)
                     if fd not in (0, 1, 2): os.close(fd)
                 httpd.serve_forever()
             def status(ui, repo, *pats, **opts):
                 """show changed files in the working directory
                 Show changed files in the repository.  If names are
                 given, only files that match are shown.
                 The codes used to show the status of files are:
                 M = modified
                 A = added
                 R = removed
                 ! = deleted, but still tracked
                 ? = not tracked
                 """
                 files, matchfn, anypats = matchpats(repo, pats, opts)
                 cwd = (pats and repo.getcwd()) or ''
                 modified, added, removed, deleted, unknown = [
                     [util.pathto(cwd, x) for x in n]
                     for n in repo.changes(files=files, match=matchfn)]
                 changetypes = [(_('modified'), 'M', modified),
                                (_('added'), 'A', added),
                                (_('removed'), 'R', removed),
                                (_('deleted'), '!', deleted),
                                (_('unknown'), '?', unknown)]
                 end = opts['print0'] and '\0' or '\n'
                 for opt, char, changes in ([ct for ct in changetypes if opts[ct[0]]]
                                            or changetypes):
                     if opts['no_status']:
                         format = "%%s%s" % end
                     else:
                         format = "%s %%s%s" % (char, end);
                     for f in changes:
                         ui.write(format % f)
             def tag(ui, repo, name, rev_=None, **opts):
                 """add a tag for the current tip or a given revision
                 Name a particular revision using <name>.
                 Tags are used to name particular revisions of the repository and are
                 very useful to compare different revision, to go back to significant
                 earlier versions or to mark branch points as releases, etc.
                 If no revision is given, the tip is used.
                 To facilitate version control, distribution, and merging of tags,
                 they are stored as a file named ".hgtags" which is managed
                 similarly to other project files and can be hand-edited if
                 necessary.  The file '.hg/localtags' is used for local tags (not
                 shared among repositories).
                 """
                 if name == "tip":
                     raise util.Abort(_("the name 'tip' is reserved"))
                 if rev_ is not None:
                     ui.warn(_("use of 'hg tag NAME [REV]' is deprecated, "
                               "please use 'hg tag [-r REV] NAME' instead\n"))
                     if opts['rev']:
                         raise util.Abort(_("use only one form to specify the revision"))
                 if opts['rev']:
                     rev_ = opts['rev']
                 if rev_:
                     r = hex(repo.lookup(rev_))
                 else:
                     r = hex(repo.changelog.tip())
                 disallowed = (revrangesep, '\r', '\n')
                 for c in disallowed:
                     if name.find(c) >= 0:
                         raise util.Abort(_("%s cannot be used in a tag name") % repr(c))
                 repo.hook('pretag', throw=True, node=r, tag=name,
                           local=int(not not opts['local']))
                 if opts['local']:
                     repo.opener("localtags", "a").write("%s %s\n" % (r, name))
                     repo.hook('tag', node=r, tag=name, local=1)
                     return
                 for x in repo.changes():
                     if ".hgtags" in x:
                         raise util.Abort(_("working copy of .hgtags is changed "
                                            "(please commit .hgtags manually)"))
                 repo.wfile(".hgtags", "ab").write("%s %s\n" % (r, name))
                 if repo.dirstate.state(".hgtags") == '?':
                     repo.add([".hgtags"])
                 message = (opts['message'] or
                            _("Added tag %s for changeset %s") % (name, r))
                 try:
                     repo.commit([".hgtags"], message, opts['user'], opts['date'])
                     repo.hook('tag', node=r, tag=name, local=0)
                 except ValueError, inst:
                     raise util.Abort(str(inst))
             def tags(ui, repo):
                 """list repository tags
                 List the repository tags.
                 This lists both regular and local tags.
                 """
                 l = repo.tagslist()
                 l.reverse()
                 for t, n in l:
                     try:
                         r = "%5d:%s" % (repo.changelog.rev(n), hex(n))
                     except KeyError:
                         r = "    ?:?"
                     ui.write("%-30s %s\n" % (t, r))
             def tip(ui, repo, **opts):
                 """show the tip revision
                 Show the tip revision.
                 """
                 n = repo.changelog.tip()
                 br = None
                 if opts['branches']:
                     br = repo.branchlookup([n])
                 show_changeset(ui, repo, changenode=n, brinfo=br)
                 if opts['patch']:
                     dodiff(ui, ui, repo, repo.changelog.parents(n)[0], n)
             def unbundle(ui, repo, fname, **opts):
                 """apply a changegroup file
                 Apply a compressed changegroup file generated by the bundle
                 command.
                 """
                 f = urllib.urlopen(fname)
                 if f.read(4) != "HG10":
                     raise util.Abort(_("%s: not a Mercurial bundle file") % fname)
                 def bzgenerator(f):
                     zd = bz2.BZ2Decompressor()
                     for chunk in f:
                         yield zd.decompress(chunk)
                 bzgen = bzgenerator(util.filechunkiter(f, 4096))
                 if repo.addchangegroup(util.chunkbuffer(bzgen)):
                     return 1
                 if opts['update']:
                     return update(ui, repo)
                 else:
                     ui.status(_("(run 'hg update' to get a working copy)\n"))
             def undo(ui, repo):
                 """undo the last commit or pull
                 Roll back the last pull or commit transaction on the
                 repository, restoring the project to its earlier state.
                 This command should be used with care. There is only one level of
                 undo and there is no redo.
                 This command is not intended for use on public repositories. Once
                 a change is visible for pull by other users, undoing it locally is
                 ineffective.
                 """
                 repo.undo()
             def update(ui, repo, node=None, merge=False, clean=False, force=None,
                        branch=None):
                 """update or merge working directory
                 Update the working directory to the specified revision.
                 If there are no outstanding changes in the working directory and
                 there is a linear relationship between the current version and the
                 requested version, the result is the requested version.
                 Otherwise the result is a merge between the contents of the
                 current working directory and the requested version. Files that
                 changed between either parent are marked as changed for the next
                 commit and a commit must be performed before any further updates
                 are allowed.
                 By default, update will refuse to run if doing so would require
                 merging or discarding local changes.
                 """
                 if branch:
                     br = repo.branchlookup(branch=branch)
                     found = []
                     for x in br:
                         if branch in br[x]:
                             found.append(x)
                     if len(found) > 1:
                         ui.warn(_("Found multiple heads for %s\n") % branch)
                         for x in found:
                             show_changeset(ui, repo, changenode=x, brinfo=br)
                         return 1
                     if len(found) == 1:
                         node = found[0]
                         ui.warn(_("Using head %s for branch %s\n") % (short(node), branch))
                     else:
                         ui.warn(_("branch %s not found\n") % (branch))
                         return 1
                 else:
                     node = node and repo.lookup(node) or repo.changelog.tip()
                 return repo.update(node, allow=merge, force=clean, forcemerge=force)
             def verify(ui, repo):
                 """verify the integrity of the repository
                 Verify the integrity of the current repository.
                 This will perform an extensive check of the repository's
                 integrity, validating the hashes and checksums of each entry in
                 the changelog, manifest, and tracked files, as well as the
                 integrity of their crosslinks and indices.
                 """
                 return repo.verify()
             # Command options and aliases are listed here, alphabetically
             table = {
                 "^add":
                     (add,
                      [('I', 'include', [], _('include names matching the given patterns')),
                       ('X', 'exclude', [], _('exclude names matching the given patterns'))],
                      _('hg add [OPTION]... [FILE]...')),
                 "addremove":
                     (addremove,
                      [('I', 'include', [], _('include names matching the given patterns')),
                       ('X', 'exclude', [], _('exclude names matching the given patterns'))],
                      _('hg addremove [OPTION]... [FILE]...')),
                 "^annotate":
                     (annotate,
                      [('r', 'rev', '', _('annotate the specified revision')),
                       ('a', 'text', None, _('treat all files as text')),
                       ('u', 'user', None, _('list the author')),
                       ('d', 'date', None, _('list the date')),
                       ('n', 'number', None, _('list the revision number (default)')),
                       ('c', 'changeset', None, _('list the changeset')),
                       ('I', 'include', [], _('include names matching the given patterns')),
                       ('X', 'exclude', [], _('exclude names matching the given patterns'))],
-                     _('hg annotate [OPTION]... FILE...')),
+                     _('hg annotate [-r <rev> -u -n -c -d] [files ...]')),
                 "bundle":
                     (bundle,
                      [],
                      _('hg bundle FILE DEST')),
                 "cat":
                     (cat,
                      [('I', 'include', [], _('include names matching the given patterns')),
                       ('X', 'exclude', [], _('exclude names matching the given patterns')),
                       ('o', 'output', '', _('print output to file with formatted name')),
                       ('r', 'rev', '', _('print the given revision'))],
                      _('hg cat [OPTION]... FILE...')),
                 "^clone":
                     (clone,
                      [('U', 'noupdate', None, _('do not update the new working directory')),
                       ('e', 'ssh', '', _('specify ssh command to use')),
                       ('', 'pull', None, _('use pull protocol to copy metadata')),
                       ('r', 'rev', [],
                        _('a changeset you would like to have after cloning')),
                       ('', 'remotecmd', '',
                        _('specify hg command to run on the remote side'))],
                      _('hg clone [OPTION]... SOURCE [DEST]')),
                 "^commit|ci":
                     (commit,
                      [('A', 'addremove', None, _('run addremove during commit')),
                       ('I', 'include', [], _('include names matching the given patterns')),
                       ('X', 'exclude', [], _('exclude names matching the given patterns')),
                       ('m', 'message', '', _('use <text> as commit message')),
                       ('l', 'logfile', '', _('read the commit message from <file>')),
                       ('d', 'date', '', _('record datecode as commit date')),
                       ('u', 'user', '', _('record user as commiter'))],
                      _('hg commit [OPTION]... [FILE]...')),
                 "copy|cp":
                     (copy,
                      [('I', 'include', [], _('include names matching the given patterns')),
                       ('X', 'exclude', [], _('exclude names matching the given patterns')),
                       ('A', 'after', None, _('record a copy that has already occurred')),
                       ('f', 'force', None,
                        _('forcibly copy over an existing managed file'))],
                      _('hg copy [OPTION]... [SOURCE]... DEST')),
                 "debugancestor": (debugancestor, [], _('debugancestor INDEX REV1 REV2')),
                 "debugrebuildstate":
                     (debugrebuildstate,
                      [('r', 'rev', "", _("revision to rebuild to"))],
                      _('debugrebuildstate [-r REV] [REV]')),
                 "debugcheckstate": (debugcheckstate, [], _('debugcheckstate')),
                 "debugconfig": (debugconfig, [], _('debugconfig')),
                 "debugsetparents": (debugsetparents, [], _('debugsetparents REV1 [REV2]')),
                 "debugstate": (debugstate, [], _('debugstate')),
                 "debugdata": (debugdata, [], _('debugdata FILE REV')),
                 "debugindex": (debugindex, [], _('debugindex FILE')),
                 "debugindexdot": (debugindexdot, [], _('debugindexdot FILE')),
                 "debugrename": (debugrename, [], _('debugrename FILE [REV]')),
                 "debugwalk":
                     (debugwalk,
                      [('I', 'include', [], _('include names matching the given patterns')),
                       ('X', 'exclude', [], _('exclude names matching the given patterns'))],
                      _('debugwalk [OPTION]... [FILE]...')),
                 "^diff":
                     (diff,
                      [('r', 'rev', [], _('revision')),
                       ('a', 'text', None, _('treat all files as text')),
                       ('I', 'include', [], _('include names matching the given patterns')),
                       ('p', 'show-function', None,
                        _('show which function each change is in')),
                       ('w', 'ignore-all-space', None,
                        _('ignore white space when comparing lines')),
                       ('X', 'exclude', [],
                        _('exclude names matching the given patterns'))],
                      _('hg diff [-a] [-I] [-X] [-r REV1 [-r REV2]] [FILE]...')),
                 "^export":
                     (export,
                      [('o', 'output', '', _('print output to file with formatted name')),
                       ('a', 'text', None, _('treat all files as text')),
                       ('', 'switch-parent', None, _('diff against the second parent'))],
-                     _('hg export [-a] [-o OUTFILE] REV...')),
+                     _('hg export [-a] [-o filespec] REV...')),
                 "forget":
                     (forget,
                      [('I', 'include', [], _('include names matching the given patterns')),
                       ('X', 'exclude', [], _('exclude names matching the given patterns'))],
                      _('hg forget [OPTION]... FILE...')),
                 "grep":
                     (grep,
                      [('0', 'print0', None, _('end fields with NUL')),
                       ('I', 'include', [], _('include names matching the given patterns')),
                       ('X', 'exclude', [], _('exclude names matching the given patterns')),
                       ('', 'all', None, _('print all revisions that match')),
                       ('i', 'ignore-case', None, _('ignore case when matching')),
                       ('l', 'files-with-matches', None,
                        _('print only filenames and revs that match')),
                       ('n', 'line-number', None, _('print matching line numbers')),
                       ('r', 'rev', [], _('search in given revision range')),
                       ('u', 'user', None, _('print user who committed change'))],
                      _('hg grep [OPTION]... PATTERN [FILE]...')),
                 "heads":
                     (heads,
                      [('b', 'branches', None, _('show branches')),
                       ('r', 'rev', '', _('show only heads which are descendants of rev'))],
                      _('hg heads [-b] [-r <rev>]')),
                 "help": (help_, [], _('hg help [COMMAND]')),
                 "identify|id": (identify, [], _('hg identify')),
                 "import|patch":
                     (import_,
                      [('p', 'strip', 1,
                        _('directory strip option for patch. This has the same\n') +
                        _('meaning as the corresponding patch option')),
                       ('f', 'force', None,
                        _('skip check for outstanding uncommitted changes')),
                       ('b', 'base', '', _('base path'))],
                      _('hg import [-f] [-p NUM] [-b BASE] PATCH...')),
                 "incoming|in": (incoming,
                      [('M', 'no-merges', None, _('do not show merges')),
                       ('p', 'patch', None, _('show patch')),
                       ('n', 'newest-first', None, _('show newest record first'))],
                      _('hg incoming [-p] [-n] [-M] [SOURCE]')),
                 "^init": (init, [], _('hg init [DEST]')),
                 "locate":
                     (locate,
                      [('r', 'rev', '', _('search the repository as it stood at rev')),
                       ('0', 'print0', None,
                        _('end filenames with NUL, for use with xargs')),
                       ('f', 'fullpath', None,
                        _('print complete paths from the filesystem root')),
                       ('I', 'include', [], _('include names matching the given patterns')),
                       ('X', 'exclude', [], _('exclude names matching the given patterns'))],
                      _('hg locate [OPTION]... [PATTERN]...')),
                 "^log|history":
                     (log,
                      [('I', 'include', [], _('include names matching the given patterns')),
                       ('X', 'exclude', [], _('exclude names matching the given patterns')),
                       ('b', 'branches', None, _('show branches')),
                       ('k', 'keyword', [], _('search for a keyword')),
                       ('l', 'limit', '', _('limit number of changes displayed')),
                       ('r', 'rev', [], _('show the specified revision or range')),
                       ('M', 'no-merges', None, _('do not show merges')),
                       ('m', 'only-merges', None, _('show only merges')),
                       ('p', 'patch', None, _('show patch'))],
                      _('hg log [-I] [-X] [-r REV]... [-p] [FILE]')),
                 "manifest": (manifest, [], _('hg manifest [REV]')),
                 "outgoing|out": (outgoing,
                      [('M', 'no-merges', None, _('do not show merges')),
                       ('p', 'patch', None, _('show patch')),
                       ('n', 'newest-first', None, _('show newest record first'))],
                      _('hg outgoing [-p] [-n] [-M] [DEST]')),
                 "^parents":
                     (parents,
                      [('b', 'branches', None, _('show branches'))],
                      _('hg parents [-b] [REV]')),
                 "paths": (paths, [], _('hg paths [NAME]')),
                 "^pull":
                     (pull,
                      [('u', 'update', None,
                        _('update the working directory to tip after pull')),
                       ('e', 'ssh', '', _('specify ssh command to use')),
                       ('r', 'rev', [], _('a specific revision you would like to pull')),
                       ('', 'remotecmd', '',
                        _('specify hg command to run on the remote side'))],
                      _('hg pull [-u] [-e FILE] [-r rev]... [--remotecmd FILE] [SOURCE]')),
                 "^push":
                     (push,
                      [('f', 'force', None, _('force push')),
                       ('e', 'ssh', '', _('specify ssh command to use')),
                       ('r', 'rev', [], _('a specific revision you would like to push')),
                       ('', 'remotecmd', '',
                        _('specify hg command to run on the remote side'))],
                      _('hg push [-f] [-e FILE] [-r rev]... [--remotecmd FILE] [DEST]')),
                 "rawcommit":
                     (rawcommit,
                      [('p', 'parent', [], _('parent')),
                       ('d', 'date', '', _('date code')),
                       ('u', 'user', '', _('user')),
                       ('F', 'files', '', _('file list')),
                       ('m', 'message', '', _('commit message')),
                       ('l', 'logfile', '', _('commit message file'))],
                      _('hg rawcommit [OPTION]... [FILE]...')),
                 "recover": (recover, [], _('hg recover')),
                 "^remove|rm":
                     (remove,
                      [('I', 'include', [], _('include names matching the given patterns')),
                       ('X', 'exclude', [], _('exclude names matching the given patterns'))],
                      _('hg remove [OPTION]... FILE...')),
                 "rename|mv":
                     (rename,
                      [('I', 'include', [], _('include names matching the given patterns')),
                       ('X', 'exclude', [], _('exclude names matching the given patterns')),
                       ('A', 'after', None, _('record a rename that has already occurred')),
                       ('f', 'force', None,
                        _('forcibly copy over an existing managed file'))],
                      _('hg rename [OPTION]... [SOURCE]... DEST')),
                 "^revert":
                     (revert,
                      [('I', 'include', [], _('include names matching the given patterns')),
                       ('X', 'exclude', [], _('exclude names matching the given patterns')),
                       ('r', 'rev', '', _('revision to revert to'))],
                      _('hg revert [-n] [-r REV] [NAME]...')),
                 "root": (root, [], _('hg root')),
                 "^serve":
                     (serve,
                      [('A', 'accesslog', '', _('name of access log file to write to')),
                       ('d', 'daemon', None, _('run server in background')),
                       ('', 'daemon-pipefds', '', _('used internally by daemon mode')),
                       ('E', 'errorlog', '', _('name of error log file to write to')),
                       ('p', 'port', 0, _('port to use (default: 8000)')),
                       ('a', 'address', '', _('address to use')),
                       ('n', 'name', '',
                        _('name to show in web pages (default: working dir)')),
                       ('', 'pid-file', '', _('name of file to write process ID to')),
                       ('', 'stdio', None, _('for remote clients')),
                       ('t', 'templates', '', _('web templates to use')),
                       ('', 'style', '', _('template style to use')),
                       ('6', 'ipv6', None, _('use IPv6 in addition to IPv4'))],
                      _('hg serve [OPTION]...')),
                 "^status|st":
                     (status,
                      [('m', 'modified', None, _('show only modified files')),
                       ('a', 'added', None, _('show only added files')),
                       ('r', 'removed', None, _('show only removed files')),
                       ('d', 'deleted', None, _('show only deleted (but tracked) files')),
                       ('u', 'unknown', None, _('show only unknown (not tracked) files')),
                       ('n', 'no-status', None, _('hide status prefix')),
                       ('0', 'print0', None,
                        _('end filenames with NUL, for use with xargs')),
                       ('I', 'include', [], _('include names matching the given patterns')),
                       ('X', 'exclude', [], _('exclude names matching the given patterns'))],
                      _('hg status [OPTION]... [FILE]...')),
                 "tag":
                     (tag,
                      [('l', 'local', None, _('make the tag local')),
                       ('m', 'message', '', _('message for tag commit log entry')),
                       ('d', 'date', '', _('record datecode as commit date')),
                       ('u', 'user', '', _('record user as commiter')),
                       ('r', 'rev', '', _('revision to tag'))],
-                     _('hg tag [-r REV] [OPTION]... NAME')),
+                     _('hg tag [-l -m <text> -d <datecode> -u <user> -r <rev>] <name>')),
                 "tags": (tags, [], _('hg tags')),
                 "tip":
                     (tip,
                      [('b', 'branches', None, _('show branches')),
                       ('p', 'patch', None, _('show patch'))],
-                     _('hg [-b] [-p] tip')),
+                     _('hg tip [-b] [-p]')),
                 "unbundle":
                     (unbundle,
                      [('u', 'update', None,
                        _('update the working directory to tip after unbundle'))],
                      _('hg unbundle [-u] FILE')),
                 "undo": (undo, [], _('hg undo')),
                 "^update|up|checkout|co":
                     (update,
                      [('b', 'branch', '', _('checkout the head of a specific branch')),
                       ('m', 'merge', None, _('allow merging of branches')),
                       ('C', 'clean', None, _('overwrite locally modified files')),
                       ('f', 'force', None, _('force a merge with outstanding changes'))],
                      _('hg update [-b TAG] [-m] [-C] [-f] [REV]')),
                 "verify": (verify, [], _('hg verify')),
                 "version": (show_version, [], _('hg version')),
             }
             globalopts = [
                 ('R', 'repository', '', _('repository root directory')),
                 ('', 'cwd', '', _('change working directory')),
                 ('y', 'noninteractive', None,
                  _('do not prompt, assume \'yes\' for any required answers')),
                 ('q', 'quiet', None, _('suppress output')),
                 ('v', 'verbose', None, _('enable additional output')),
                 ('', 'debug', None, _('enable debugging output')),
                 ('', 'debugger', None, _('start debugger')),
                 ('', 'traceback', None, _('print traceback on exception')),
                 ('', 'time', None, _('time how long the command takes')),
                 ('', 'profile', None, _('print command execution profile')),
                 ('', 'version', None, _('output version information and exit')),
                 ('h', 'help', None, _('display help and exit')),
             ]
             norepo = ("clone init version help debugancestor debugconfig debugdata"
                       " debugindex debugindexdot paths")
             def find(cmd):
                 """Return (aliases, command table entry) for command string."""
                 choice = None
                 count = 0
                 for e in table.keys():
                     aliases = e.lstrip("^").split("|")
                     if cmd in aliases:
                         return aliases, table[e]
                     for a in aliases:
                         if a.startswith(cmd):
                             count += 1
                             choice = aliases, table[e]
                             break
                 if count > 1:
                     raise AmbiguousCommand(cmd)
                 if choice:
                     return choice
                 raise UnknownCommand(cmd)
             class SignalInterrupt(Exception):
                 """Exception raised on SIGTERM and SIGHUP."""
             def catchterm(*args):
                 raise SignalInterrupt
             def run():
                 sys.exit(dispatch(sys.argv[1:]))
             class ParseError(Exception):
                 """Exception raised on errors in parsing the command line."""
             def parse(ui, args):
                 options = {}
                 cmdoptions = {}
                 try:
                     args = fancyopts.fancyopts(args, globalopts, options)
                 except fancyopts.getopt.GetoptError, inst:
                     raise ParseError(None, inst)
                 if args:
                     cmd, args = args[0], args[1:]
                     aliases, i = find(cmd)
                     cmd = aliases[0]
                     defaults = ui.config("defaults", cmd)
                     if defaults:
                         args = defaults.split() + args
                     c = list(i[1])
                 else:
                     cmd = None
                     c = []
                 # combine global options into local
                 for o in globalopts:
                     c.append((o[0], o[1], options[o[1]], o[3]))
                 try:
                     args = fancyopts.fancyopts(args, c, cmdoptions)
                 except fancyopts.getopt.GetoptError, inst:
                     raise ParseError(cmd, inst)
                 # separate global options back out
                 for o in globalopts:
                     n = o[1]
                     options[n] = cmdoptions[n]
                     del cmdoptions[n]
                 return (cmd, cmd and i[0] or None, args, options, cmdoptions)
             def dispatch(args):
                 signal.signal(signal.SIGTERM, catchterm)
                 try:
                     signal.signal(signal.SIGHUP, catchterm)
                 except AttributeError:
                     pass
                 try:
                     u = ui.ui()
                 except util.Abort, inst:
                     sys.stderr.write(_("abort: %s\n") % inst)
                     sys.exit(1)
                 external = []
                 for x in u.extensions():
                     def on_exception(exc, inst):
                         u.warn(_("*** failed to import extension %s\n") % x[1])
                         u.warn("%s\n" % inst)
                         if "--traceback" in sys.argv[1:]:
                             traceback.print_exc()
                     if x[1]:
                         try:
                             mod = imp.load_source(x[0], x[1])
                         except Exception, inst:
                             on_exception(Exception, inst)
                             continue
                     else:
                         def importh(name):
                             mod = __import__(name)
                             components = name.split('.')
                             for comp in components[1:]:
                                 mod = getattr(mod, comp)
                             return mod
                         try:
                             mod = importh(x[0])
                         except Exception, inst:
                             on_exception(Exception, inst)
                             continue
                     external.append(mod)
                 for x in external:
                     cmdtable = getattr(x, 'cmdtable', {})
                     for t in cmdtable:
                         if t in table:
                             u.warn(_("module %s overrides %s\n") % (x.__name__, t))
                     table.update(cmdtable)
                 try:
                     cmd, func, args, options, cmdoptions = parse(u, args)
                 except ParseError, inst:
                     if inst.args[0]:
                         u.warn(_("hg %s: %s\n") % (inst.args[0], inst.args[1]))
                         help_(u, inst.args[0])
                     else:
                         u.warn(_("hg: %s\n") % inst.args[1])
                         help_(u, 'shortlist')
                     sys.exit(-1)
                 except AmbiguousCommand, inst:
                     u.warn(_("hg: command '%s' is ambiguous.\n") % inst.args[0])
                     sys.exit(1)
                 except UnknownCommand, inst:
                     u.warn(_("hg: unknown command '%s'\n") % inst.args[0])
                     help_(u, 'shortlist')
                     sys.exit(1)
                 if options["time"]:
                     def get_times():
                         t = os.times()
                         if t[4] == 0.0: # Windows leaves this as zero, so use time.clock()
                             t = (t[0], t[1], t[2], t[3], time.clock())
                         return t
                     s = get_times()
                     def print_time():
                         t = get_times()
                         u.warn(_("Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n") %
                             (t[4]-s[4], t[0]-s[0], t[2]-s[2], t[1]-s[1], t[3]-s[3]))
                     atexit.register(print_time)
                 u.updateopts(options["verbose"], options["debug"], options["quiet"],
                           not options["noninteractive"])
                 # enter the debugger before command execution
                 if options['debugger']:
                     pdb.set_trace()
                 try:
                     try:
                         if options['help']:
                             help_(u, cmd, options['version'])
                             sys.exit(0)
                         elif options['version']:
                             show_version(u)
                             sys.exit(0)
                         elif not cmd:
                             help_(u, 'shortlist')
                             sys.exit(0)
                         if options['cwd']:
                             try:
                                 os.chdir(options['cwd'])
                             except OSError, inst:
                                 raise util.Abort('%s: %s' %
                                                  (options['cwd'], inst.strerror))
                         if cmd not in norepo.split():
                             path = options["repository"] or ""
                             repo = hg.repository(ui=u, path=path)
                             for x in external:
                                 if hasattr(x, 'reposetup'):
                                     x.reposetup(u, repo)
                             d = lambda: func(u, repo, *args, **cmdoptions)
                         else:
                             d = lambda: func(u, *args, **cmdoptions)
                         if options['profile']:
                             import hotshot, hotshot.stats
                             prof = hotshot.Profile("hg.prof")
                             r = prof.runcall(d)
                             prof.close()
                             stats = hotshot.stats.load("hg.prof")
                             stats.strip_dirs()
                             stats.sort_stats('time', 'calls')
                             stats.print_stats(40)
                             return r
                         else:
                             return d()
                     except:
                         # enter the debugger when we hit an exception
                         if options['debugger']:
                             pdb.post_mortem(sys.exc_info()[2])
                         if options['traceback']:
                             traceback.print_exc()
                         raise
                 except hg.RepoError, inst:
                     u.warn(_("abort: "), inst, "!\n")
                 except revlog.RevlogError, inst:
                     u.warn(_("abort: "), inst, "!\n")
                 except SignalInterrupt:
                     u.warn(_("killed!\n"))
                 except KeyboardInterrupt:
                     try:
                         u.warn(_("interrupted!\n"))
                     except IOError, inst:
                         if inst.errno == errno.EPIPE:
                             if u.debugflag:
                                 u.warn(_("\nbroken pipe\n"))
                         else:
                             raise
                 except IOError, inst:
                     if hasattr(inst, "code"):
                         u.warn(_("abort: %s\n") % inst)
                     elif hasattr(inst, "reason"):
                         u.warn(_("abort: error: %s\n") % inst.reason[1])
                     elif hasattr(inst, "args") and inst[0] == errno.EPIPE:
                         if u.debugflag:
                             u.warn(_("broken pipe\n"))
                     elif getattr(inst, "strerror", None):
                         if getattr(inst, "filename", None):
                             u.warn(_("abort: %s - %s\n") % (inst.strerror, inst.filename))
                         else:
                             u.warn(_("abort: %s\n") % inst.strerror)
                     else:
                         raise
                 except OSError, inst:
                     if hasattr(inst, "filename"):
                         u.warn(_("abort: %s: %s\n") % (inst.strerror, inst.filename))
                     else:
                         u.warn(_("abort: %s\n") % inst.strerror)
                 except util.Abort, inst:
                     u.warn(_('abort: '), inst.args[0] % inst.args[1:], '\n')
                     sys.exit(1)
                 except TypeError, inst:
                     # was this an argument error?
                     tb = traceback.extract_tb(sys.exc_info()[2])
                     if len(tb) > 2: # no
                         raise
                     u.debug(inst, "\n")
                     u.warn(_("%s: invalid arguments\n") % cmd)
                     help_(u, cmd)
                 except AmbiguousCommand, inst:
                     u.warn(_("hg: command '%s' is ambiguous.\n") % inst.args[0])
                     help_(u, 'shortlist')
                 except UnknownCommand, inst:
                     u.warn(_("hg: unknown command '%s'\n") % inst.args[0])
                     help_(u, 'shortlist')
                 except SystemExit:
                     # don't catch this in the catch-all below
                     raise
                 except:
                     u.warn(_("** unknown exception encountered, details follow\n"))
                     u.warn(_("** report bug details to mercurial@selenic.com\n"))
                     u.warn(_("** Mercurial Distributed SCM (version %s)\n")
                            % version.get_version())
                     raise
                 sys.exit(-1)