upstream/mercurial-mirror Commit - r1803:06e7447c

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 node1:

280

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

281

# with repo.changes and the revlog cache.

282

change = repo.changelog.read(node1)

283

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

284

date1 = util.datestr(change[2])

285

279

if not changes:

286

if not changes:

280

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

287

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

281

modified, added, removed, deleted, unknown = changes

288

modified, added, removed, deleted, unknown = changes

282

if files:

289

if files:

283

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

290

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

284

(modified, added, removed))

291

(modified, added, removed))

285

292

286

if not modified and not added and not removed:

293

if not modified and not added and not removed:

287

return

294

return

288

295

289

if node2:

296

if node2:

290

change = repo.changelog.read(node2)

297

change = repo.changelog.read(node2)

291

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

298

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

292

date2 = util.datestr(change[2])

299

date2 = util.datestr(change[2])

293

def read(f):

300

def read(f):

294

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

301

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

295

else:

302

else:

296

date2 = util.datestr()

303

date2 = util.datestr()

297

if not node1:

304

if not node1:

298

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

305

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

306

change = repo.changelog.read(node1)

307

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

308

date1 = util.datestr(change[2])

299

def read(f):

309

def read(f):

300

return repo.wread(f)

310

return repo.wread(f)

301

311

302

if ui.quiet:

312

if ui.quiet:

303

r = None

313

r = None

304

else:

314

else:

305

hexfunc = ui.verbose and hex or short

315

hexfunc = ui.verbose and hex or short

306

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

316

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

307

317

308

change = repo.changelog.read(node1)

309

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

310

date1 = util.datestr(change[2])

311

312

diffopts = ui.diffopts()

318

diffopts = ui.diffopts()

313

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

319

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

314

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

320

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

315

for f in modified:

321

for f in modified:

316

to = None

322

to = None

317

if f in mmap:

323

if f in mmap:

318

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

324

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

319

tn = read(f)

325

tn = read(f)

320

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

326

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

321

showfunc=showfunc, ignorews=ignorews))

327

showfunc=showfunc, ignorews=ignorews))

322

for f in added:

328

for f in added:

323

to = None

329

to = None

324

tn = read(f)

330

tn = read(f)

325

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

331

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

326

showfunc=showfunc, ignorews=ignorews))

332

showfunc=showfunc, ignorews=ignorews))

327

for f in removed:

333

for f in removed:

328

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

334

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

329

tn = None

335

tn = None

330

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

336

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

331

showfunc=showfunc, ignorews=ignorews))

337

showfunc=showfunc, ignorews=ignorews))

332

338

333

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

339

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

334

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

340

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

335

user = revcache.get(rev)

341

user = revcache.get(rev)

336

if user is None:

342

if user is None:

337

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

343

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

338

return user

344

return user

339

345

340

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

346

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

341

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

347

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

342

log = repo.changelog

348

log = repo.changelog

343

if changenode is None:

349

if changenode is None:

344

changenode = log.node(rev)

350

changenode = log.node(rev)

345

elif not rev:

351

elif not rev:

346

rev = log.rev(changenode)

352

rev = log.rev(changenode)

347

353

348

if ui.quiet:

354

if ui.quiet:

349

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

355

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

350

return

356

return

351

357

352

changes = log.read(changenode)

358

changes = log.read(changenode)

353

date = util.datestr(changes[2])

359

date = util.datestr(changes[2])

354

360

355

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

361

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

356

for p in log.parents(changenode)

362

for p in log.parents(changenode)

357

if ui.debugflag or p != nullid]

363

if ui.debugflag or p != nullid]

358

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

364

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

359

parents = []

365

parents = []

360

366

361

if ui.verbose:

367

if ui.verbose:

362

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

368

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

363

else:

369

else:

364

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

370

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

365

371

366

for tag in repo.nodetags(changenode):

372

for tag in repo.nodetags(changenode):

367

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

373

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

368

for parent in parents:

374

for parent in parents:

369

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

375

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

370

376

371

if brinfo and changenode in brinfo:

377

if brinfo and changenode in brinfo:

372

br = brinfo[changenode]

378

br = brinfo[changenode]

373

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

379

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

374

380

375

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

381

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

376

hex(changes[0])))

382

hex(changes[0])))

377

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

383

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

378

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

384

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

379

385

380

if ui.debugflag:

386

if ui.debugflag:

381

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

387

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

382

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

388

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

383

if value:

389

if value:

384

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

390

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

385

else:

391

else:

386

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

392

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

387

393

388

description = changes[4].strip()

394

description = changes[4].strip()

389

if description:

395

if description:

390

if ui.verbose:

396

if ui.verbose:

391

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

397

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

392

ui.status(description)

398

ui.status(description)

393

ui.status("\n\n")

399

ui.status("\n\n")

394

else:

400

else:

395

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

401

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

396

ui.status("\n")

402

ui.status("\n")

397

403

398

def show_version(ui):

404

def show_version(ui):

399

"""output version and copyright information"""

405

"""output version and copyright information"""

400

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

406

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

401

% version.get_version())

407

% version.get_version())

402

ui.status(_(

408

ui.status(_(

403

409

404

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

410

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

405

"There is NO\nwarranty; "

411

"There is NO\nwarranty; "

406

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

412

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

407

))

413

))

408

414

409

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

415

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

410

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

416

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

411

option_lists = []

417

option_lists = []

412

if cmd and cmd != 'shortlist':

418

if cmd and cmd != 'shortlist':

413

if with_version:

419

if with_version:

414

show_version(ui)

420

show_version(ui)

415

ui.write('\n')

421

ui.write('\n')

416

aliases, i = find(cmd)

422

aliases, i = find(cmd)

417

# synopsis

423

# synopsis

418

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

424

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

419

425

420

# description

426

# description

421

doc = i[0].__doc__

427

doc = i[0].__doc__

422

if not doc:

428

if not doc:

423

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

429

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

424

if ui.quiet:

430

if ui.quiet:

425

doc = doc.splitlines(0)[0]

431

doc = doc.splitlines(0)[0]

426

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

432

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

427

433

428

if not ui.quiet:

434

if not ui.quiet:

429

# aliases

435

# aliases

430

if len(aliases) > 1:

436

if len(aliases) > 1:

431

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

437

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

432

438

433

# options

439

# options

434

if i[1]:

440

if i[1]:

435

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

441

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

436

442

437

else:

443

else:

438

# program name

444

# program name

439

if ui.verbose or with_version:

445

if ui.verbose or with_version:

440

show_version(ui)

446

show_version(ui)

441

else:

447

else:

442

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

448

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

443

ui.status('\n')

449

ui.status('\n')

444

450

445

# list of commands

451

# list of commands

446

if cmd == "shortlist":

452

if cmd == "shortlist":

447

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

453

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

448

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

454

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

449

elif ui.verbose:

455

elif ui.verbose:

450

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

456

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

451

else:

457

else:

452

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

458

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

453

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

459

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

454

460

455

h = {}

461

h = {}

456

cmds = {}

462

cmds = {}

457

for c, e in table.items():

463

for c, e in table.items():

458

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

464

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

459

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

465

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

460

continue

466

continue

461

f = f.lstrip("^")

467

f = f.lstrip("^")

462

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

468

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

463

continue

469

continue

464

doc = e[0].__doc__

470

doc = e[0].__doc__

465

if not doc:

471

if not doc:

466

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

472

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

467

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

473

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

468

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

474

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

469

475

470

fns = h.keys()

476

fns = h.keys()

471

fns.sort()

477

fns.sort()

472

m = max(map(len, fns))

478

m = max(map(len, fns))

473

for f in fns:

479

for f in fns:

474

if ui.verbose:

480

if ui.verbose:

475

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

481

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

476

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

482

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

477

else:

483

else:

478

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

484

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

479

485

480

# global options

486

# global options

481

if ui.verbose:

487

if ui.verbose:

482

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

488

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

483

489

484

# list all option lists

490

# list all option lists

485

opt_output = []

491

opt_output = []

486

for title, options in option_lists:

492

for title, options in option_lists:

487

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

493

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

488

for shortopt, longopt, default, desc in options:

494

for shortopt, longopt, default, desc in options:

489

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

495

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

490

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

496

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

491

"%s%s" % (desc,

497

"%s%s" % (desc,

492

default

498

default

493

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

499

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

494

or "")))

500

or "")))

495

501

496

if opt_output:

502

if opt_output:

497

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

503

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

498

for first, second in opt_output:

504

for first, second in opt_output:

499

if second:

505

if second:

500

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

506

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

501

else:

507

else:

502

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

508

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

503

509

504

# Commands start here, listed alphabetically

510

# Commands start here, listed alphabetically

505

511

506

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

512

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

507

"""add the specified files on the next commit

513

"""add the specified files on the next commit

508

514

509

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

515

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

510

516

511

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

517

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

512

518

513

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

519

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

514

"""

520

"""

515

521

516

names = []

522

names = []

517

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

523

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

518

if exact:

524

if exact:

519

if ui.verbose:

525

if ui.verbose:

520

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

526

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

521

names.append(abs)

527

names.append(abs)

522

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

528

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

523

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

529

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

524

names.append(abs)

530

names.append(abs)

525

repo.add(names)

531

repo.add(names)

526

532

527

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

533

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

528

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

534

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

529

535

530

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

536

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

531

537

532

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

538

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

533

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

539

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

534

"""

540

"""

535

return addremove_lock(ui, repo, pats, opts)

541

return addremove_lock(ui, repo, pats, opts)

536

542

537

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

543

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

538

add, remove = [], []

544

add, remove = [], []

539

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

545

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

540

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

546

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

541

add.append(abs)

547

add.append(abs)

542

if ui.verbose or not exact:

548

if ui.verbose or not exact:

543

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

549

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

544

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

550

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

545

remove.append(abs)

551

remove.append(abs)

546

if ui.verbose or not exact:

552

if ui.verbose or not exact:

547

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

553

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

548

repo.add(add, wlock=wlock)

554

repo.add(add, wlock=wlock)

549

repo.remove(remove, wlock=wlock)

555

repo.remove(remove, wlock=wlock)

550

556

551

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

557

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

552

"""show changeset information per file line

558

"""show changeset information per file line

553

559

554

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

560

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

555

561

556

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

562

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

557

place.

563

place.

558

564

559

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

565

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

560

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

566

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

561

anyway, probably with undesirable results.

567

anyway, probably with undesirable results.

562

"""

568

"""

563

def getnode(rev):

569

def getnode(rev):

564

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

570

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

565

571

566

ucache = {}

572

ucache = {}

567

def getname(rev):

573

def getname(rev):

568

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

574

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

569

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

575

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

570

576

571

dcache = {}

577

dcache = {}

572

def getdate(rev):

578

def getdate(rev):

573

datestr = dcache.get(rev)

579

datestr = dcache.get(rev)

574

if datestr is None:

580

if datestr is None:

575

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

581

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

576

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

582

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

577

return datestr

583

return datestr

578

584

579

if not pats:

585

if not pats:

580

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

586

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

581

587

582

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

588

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

583

['date', getdate]]

589

['date', getdate]]

584

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

590

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

585

opts['number'] = 1

591

opts['number'] = 1

586

592

587

if opts['rev']:

593

if opts['rev']:

588

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

594

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

589

else:

595

else:

590

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

596

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

591

change = repo.changelog.read(node)

597

change = repo.changelog.read(node)

592

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

598

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

593

599

594

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

600

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

595

if abs not in mmap:

601

if abs not in mmap:

596

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

602

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

597

((pats and rel) or abs))

603

((pats and rel) or abs))

598

continue

604

continue

599

605

600

f = repo.file(abs)

606

f = repo.file(abs)

601

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

607

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

602

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

608

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

603

continue

609

continue

604

610

605

lines = f.annotate(mmap[abs])

611

lines = f.annotate(mmap[abs])

606

pieces = []

612

pieces = []

607

613

608

for o, f in opmap:

614

for o, f in opmap:

609

if opts[o]:

615

if opts[o]:

610

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

616

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

611

if l:

617

if l:

612

m = max(map(len, l))

618

m = max(map(len, l))

613

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

619

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

614

620

615

if pieces:

621

if pieces:

616

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

622

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

617

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

623

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

618

624

619

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

625

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

620

"""create a changegroup file

626

"""create a changegroup file

621

627

622

Generate a compressed changegroup file collecting all changesets

628

Generate a compressed changegroup file collecting all changesets

623

not found in the other repository.

629

not found in the other repository.

624

630

625

This file can then be transferred using conventional means and

631

This file can then be transferred using conventional means and

626

applied to another repository with the unbundle command. This is

632

applied to another repository with the unbundle command. This is

627

useful when native push and pull are not available or when

633

useful when native push and pull are not available or when

628

exporting an entire repository is undesirable. The standard file

634

exporting an entire repository is undesirable. The standard file

629

extension is ".hg".

635

extension is ".hg".

630

636

631

Unlike import/export, this exactly preserves all changeset

637

Unlike import/export, this exactly preserves all changeset

632

contents including permissions, rename data, and revision history.

638

contents including permissions, rename data, and revision history.

633

"""

639

"""

634

f = open(fname, "wb")

640

f = open(fname, "wb")

635

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

641

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

636

other = hg.repository(ui, dest)

642

other = hg.repository(ui, dest)

637

o = repo.findoutgoing(other)

643

o = repo.findoutgoing(other)

638

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

644

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

639

645

640

try:

646

try:

641

f.write("HG10")

647

f.write("HG10")

642

z = bz2.BZ2Compressor(9)

648

z = bz2.BZ2Compressor(9)

643

while 1:

649

while 1:

644

chunk = cg.read(4096)

650

chunk = cg.read(4096)

645

if not chunk:

651

if not chunk:

646

break

652

break

647

f.write(z.compress(chunk))

653

f.write(z.compress(chunk))

648

f.write(z.flush())

654

f.write(z.flush())

649

except:

655

except:

650

os.unlink(fname)

656

os.unlink(fname)

651

raise

657

raise

652

658

653

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

659

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

654

"""output the latest or given revisions of files

660

"""output the latest or given revisions of files

655

661

656

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

662

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

657

If no revision is given then the tip is used.

663

If no revision is given then the tip is used.

658

664

659

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

665

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

660

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

666

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

661

for the export command, with the following additions:

667

for the export command, with the following additions:

662

668

663

%s basename of file being printed

669

%s basename of file being printed

664

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

670

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

665

%p root-relative path name of file being printed

671

%p root-relative path name of file being printed

666

"""

672

"""

667

mf = {}

673

mf = {}

668

rev = opts['rev']

674

rev = opts['rev']

669

if rev:

675

if rev:

670

node = repo.lookup(rev)

676

node = repo.lookup(rev)

671

else:

677

else:

672

node = repo.changelog.tip()

678

node = repo.changelog.tip()

673

change = repo.changelog.read(node)

679

change = repo.changelog.read(node)

674

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

680

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

675

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

681

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

676

r = repo.file(abs)

682

r = repo.file(abs)

677

n = mf[abs]

683

n = mf[abs]

678

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

684

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

679

fp.write(r.read(n))

685

fp.write(r.read(n))

680

686

681

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

687

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

682

"""make a copy of an existing repository

688

"""make a copy of an existing repository

683

689

684

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

690

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

685

691

686

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

692

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

687

basename of the source.

693

basename of the source.

688

694

689

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

695

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

690

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

696

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

691

697

692

For efficiency, hardlinks are used for cloning whenever the source

698

For efficiency, hardlinks are used for cloning whenever the source

693

and destination are on the same filesystem. Some filesystems,

699

and destination are on the same filesystem. Some filesystems,

694

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

700

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

695

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

701

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

696

hardlinking.

702

hardlinking.

697

"""

703

"""

698

if dest is None:

704

if dest is None:

699

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

705

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

700

706

701

if os.path.exists(dest):

707

if os.path.exists(dest):

702

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

708

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

703

709

704

dest = os.path.realpath(dest)

710

dest = os.path.realpath(dest)

705

711

706

class Dircleanup(object):

712

class Dircleanup(object):

707

def __init__(self, dir_):

713

def __init__(self, dir_):

708

self.rmtree = shutil.rmtree

714

self.rmtree = shutil.rmtree

709

self.dir_ = dir_

715

self.dir_ = dir_

710

os.mkdir(dir_)

716

os.mkdir(dir_)

711

def close(self):

717

def close(self):

712

self.dir_ = None

718

self.dir_ = None

713

def __del__(self):

719

def __del__(self):

714

if self.dir_:

720

if self.dir_:

715

self.rmtree(self.dir_, True)

721

self.rmtree(self.dir_, True)

716

722

717

if opts['ssh']:

723

if opts['ssh']:

718

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

724

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

719

if opts['remotecmd']:

725

if opts['remotecmd']:

720

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

726

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

721

727

722

if not os.path.exists(source):

728

if not os.path.exists(source):

723

source = ui.expandpath(source)

729

source = ui.expandpath(source)

724

730

725

d = Dircleanup(dest)

731

d = Dircleanup(dest)

726

abspath = source

732

abspath = source

727

other = hg.repository(ui, source)

733

other = hg.repository(ui, source)

728

734

729

copy = False

735

copy = False

730

if other.dev() != -1:

736

if other.dev() != -1:

731

abspath = os.path.abspath(source)

737

abspath = os.path.abspath(source)

732

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

738

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

733

copy = True

739

copy = True

734

740

735

if copy:

741

if copy:

736

try:

742

try:

737

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

743

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

738

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

744

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

739

# not pointed to by changesets, thus causing verify to

745

# not pointed to by changesets, thus causing verify to

740

# fail

746

# fail

741

l1 = other.lock()

747

l1 = other.lock()

742

except lock.LockException:

748

except lock.LockException:

743

copy = False

749

copy = False

744

750

745

if copy:

751

if copy:

746

# we lock here to avoid premature writing to the target

752

# we lock here to avoid premature writing to the target

747

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

753

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

748

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

754

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

749

755

750

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

756

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

751

for f in files.split():

757

for f in files.split():

752

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

758

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

753

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

759

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

754

try:

760

try:

755

util.copyfiles(src, dst)

761

util.copyfiles(src, dst)

756

except OSError, inst:

762

except OSError, inst:

757

if inst.errno != errno.ENOENT:

763

if inst.errno != errno.ENOENT:

758

raise

764

raise

759

765

760

repo = hg.repository(ui, dest)

766

repo = hg.repository(ui, dest)

761

767

762

else:

768

else:

763

revs = None

769

revs = None

764

if opts['rev']:

770

if opts['rev']:

765

if not other.local():

771

if not other.local():

766

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

772

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

767

raise util.Abort(error)

773

raise util.Abort(error)

768

else:

774

else:

769

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

775

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

770

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

776

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

771

repo.pull(other, heads = revs)

777

repo.pull(other, heads = revs)

772

778

773

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

779

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

774

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

780

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

775

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

781

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

776

f.close()

782

f.close()

777

783

778

if not opts['noupdate']:

784

if not opts['noupdate']:

779

update(ui, repo)

785

update(ui, repo)

780

786

781

d.close()

787

d.close()

782

788

783

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

789

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

784

"""commit the specified files or all outstanding changes

790

"""commit the specified files or all outstanding changes

785

791

786

Commit changes to the given files into the repository.

792

Commit changes to the given files into the repository.

787

793

788

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

794

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

789

will be commited.

795

will be commited.

790

796

791

The HGEDITOR or EDITOR environment variables are used to start an

797

The HGEDITOR or EDITOR environment variables are used to start an

792

editor to add a commit comment.

798

editor to add a commit comment.

793

"""

799

"""

794

message = opts['message']

800

message = opts['message']

795

logfile = opts['logfile']

801

logfile = opts['logfile']

796

802

797

if message and logfile:

803

if message and logfile:

798

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

804

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

799

'exclusive'))

805

'exclusive'))

800

if not message and logfile:

806

if not message and logfile:

801

try:

807

try:

802

if logfile == '-':

808

if logfile == '-':

803

message = sys.stdin.read()

809

message = sys.stdin.read()

804

else:

810

else:

805

message = open(logfile).read()

811

message = open(logfile).read()

806

except IOError, inst:

812

except IOError, inst:

807

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

813

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

808

(logfile, inst.strerror))

814

(logfile, inst.strerror))

809

815

810

if opts['addremove']:

816

if opts['addremove']:

811

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

817

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

812

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

818

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

813

if pats:

819

if pats:

814

modified, added, removed, deleted, unknown = (

820

modified, added, removed, deleted, unknown = (

815

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

821

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

816

files = modified + added + removed

822

files = modified + added + removed

817

else:

823

else:

818

files = []

824

files = []

819

try:

825

try:

820

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

826

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

821

except ValueError, inst:

827

except ValueError, inst:

822

raise util.Abort(str(inst))

828

raise util.Abort(str(inst))

823

829

824

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

830

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

825

cwd = repo.getcwd()

831

cwd = repo.getcwd()

826

errors = 0

832

errors = 0

827

copied = []

833

copied = []

828

targets = {}

834

targets = {}

829

835

830

def okaytocopy(abs, rel, exact):

836

def okaytocopy(abs, rel, exact):

831

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

837

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

832

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

838

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

833

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

839

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

834

state = repo.dirstate.state(abs)

840

state = repo.dirstate.state(abs)

835

reason = reasons.get(state)

841

reason = reasons.get(state)

836

if reason:

842

if reason:

837

if state == 'a':

843

if state == 'a':

838

origsrc = repo.dirstate.copied(abs)

844

origsrc = repo.dirstate.copied(abs)

839

if origsrc is not None:

845

if origsrc is not None:

840

return origsrc

846

return origsrc

841

if exact:

847

if exact:

842

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

848

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

843

else:

849

else:

844

return abs

850

return abs

845

851

846

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

852

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

847

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

853

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

848

reltarget = util.pathto(cwd, abstarget)

854

reltarget = util.pathto(cwd, abstarget)

849

prevsrc = targets.get(abstarget)

855

prevsrc = targets.get(abstarget)

850

if prevsrc is not None:

856

if prevsrc is not None:

851

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

857

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

852

(reltarget, abssrc, prevsrc))

858

(reltarget, abssrc, prevsrc))

853

return

859

return

854

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

860

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

855

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

861

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

856

if not opts['force']:

862

if not opts['force']:

857

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

863

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

858

reltarget)

864

reltarget)

859

return

865

return

860

if not opts['after']:

866

if not opts['after']:

861

os.unlink(reltarget)

867

os.unlink(reltarget)

862

if opts['after']:

868

if opts['after']:

863

if not os.path.exists(reltarget):

869

if not os.path.exists(reltarget):

864

return

870

return

865

else:

871

else:

866

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

872

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

867

if not os.path.isdir(targetdir):

873

if not os.path.isdir(targetdir):

868

os.makedirs(targetdir)

874

os.makedirs(targetdir)

869

try:

875

try:

870

shutil.copyfile(relsrc, reltarget)

876

shutil.copyfile(relsrc, reltarget)

871

shutil.copymode(relsrc, reltarget)

877

shutil.copymode(relsrc, reltarget)

872

except shutil.Error, inst:

878

except shutil.Error, inst:

873

raise util.Abort(str(inst))

879

raise util.Abort(str(inst))

874

except IOError, inst:

880

except IOError, inst:

875

if inst.errno == errno.ENOENT:

881

if inst.errno == errno.ENOENT:

876

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

882

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

877

else:

883

else:

878

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

884

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

879

(relsrc, inst.strerror))

885

(relsrc, inst.strerror))

880

errors += 1

886

errors += 1

881

return

887

return

882

if ui.verbose or not exact:

888

if ui.verbose or not exact:

883

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

889

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

884

targets[abstarget] = abssrc

890

targets[abstarget] = abssrc

885

repo.copy(origsrc, abstarget)

891

repo.copy(origsrc, abstarget)

886

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

892

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

887

893

888

def targetpathfn(pat, dest, srcs):

894

def targetpathfn(pat, dest, srcs):

889

if os.path.isdir(pat):

895

if os.path.isdir(pat):

890

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

896

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

891

if destdirexists:

897

if destdirexists:

892

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

898

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

893

else:

899

else:

894

striplen = len(abspfx)

900

striplen = len(abspfx)

895

if striplen:

901

if striplen:

896

striplen += len(os.sep)

902

striplen += len(os.sep)

897

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

903

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

898

elif destdirexists:

904

elif destdirexists:

899

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

905

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

900

else:

906

else:

901

res = lambda p: dest

907

res = lambda p: dest

902

return res

908

return res

903

909

904

def targetpathafterfn(pat, dest, srcs):

910

def targetpathafterfn(pat, dest, srcs):

905

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

911

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

906

# a mercurial pattern

912

# a mercurial pattern

907

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

913

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

908

else:

914

else:

909

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

915

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

910

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

916

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

911

# A directory. Either the target path contains the last

917

# A directory. Either the target path contains the last

912

# component of the source path or it does not.

918

# component of the source path or it does not.

913

def evalpath(striplen):

919

def evalpath(striplen):

914

score = 0

920

score = 0

915

for s in srcs:

921

for s in srcs:

916

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

922

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

917

if os.path.exists(t):

923

if os.path.exists(t):

918

score += 1

924

score += 1

919

return score

925

return score

920

926

921

striplen = len(abspfx)

927

striplen = len(abspfx)

922

if striplen:

928

if striplen:

923

striplen += len(os.sep)

929

striplen += len(os.sep)

924

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

930

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

925

score = evalpath(striplen)

931

score = evalpath(striplen)

926

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

932

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

927

if striplen1:

933

if striplen1:

928

striplen1 += len(os.sep)

934

striplen1 += len(os.sep)

929

if evalpath(striplen1) > score:

935

if evalpath(striplen1) > score:

930

striplen = striplen1

936

striplen = striplen1

931

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

937

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

932

else:

938

else:

933

# a file

939

# a file

934

if destdirexists:

940

if destdirexists:

935

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

941

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

936

else:

942

else:

937

res = lambda p: dest

943

res = lambda p: dest

938

return res

944

return res

939

945

940

946

941

pats = list(pats)

947

pats = list(pats)

942

if not pats:

948

if not pats:

943

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

949

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

944

if len(pats) == 1:

950

if len(pats) == 1:

945

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

951

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

946

dest = pats.pop()

952

dest = pats.pop()

947

destdirexists = os.path.isdir(dest)

953

destdirexists = os.path.isdir(dest)

948

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

954

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

949

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

955

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

950

'existing directory'))

956

'existing directory'))

951

if opts['after']:

957

if opts['after']:

952

tfn = targetpathafterfn

958

tfn = targetpathafterfn

953

else:

959

else:

954

tfn = targetpathfn

960

tfn = targetpathfn

955

copylist = []

961

copylist = []

956

for pat in pats:

962

for pat in pats:

957

srcs = []

963

srcs = []

958

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

964

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

959

origsrc = okaytocopy(abssrc, relsrc, exact)

965

origsrc = okaytocopy(abssrc, relsrc, exact)

960

if origsrc:

966

if origsrc:

961

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

967

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

962

if not srcs:

968

if not srcs:

963

continue

969

continue

964

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

970

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

965

if not copylist:

971

if not copylist:

966

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

972

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

967

973

968

for targetpath, srcs in copylist:

974

for targetpath, srcs in copylist:

969

for origsrc, abssrc, relsrc, exact in srcs:

975

for origsrc, abssrc, relsrc, exact in srcs:

970

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

976

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

971

977

972

if errors:

978

if errors:

973

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

979

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

974

return errors, copied

980

return errors, copied

975

981

976

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

982

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

977

"""mark files as copied for the next commit

983

"""mark files as copied for the next commit

978

984

979

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

985

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

980

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

986

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

981

there can only be one source.

987

there can only be one source.

982

988

983

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

989

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

984

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

990

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

985

operation is recorded, but no copying is performed.

991

operation is recorded, but no copying is performed.

986

992

987

This command takes effect in the next commit.

993

This command takes effect in the next commit.

988

994

989

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

995

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

990

should properly record copied files, this information is not yet

996

should properly record copied files, this information is not yet

991

fully used by merge, nor fully reported by log.

997

fully used by merge, nor fully reported by log.

992

"""

998

"""

993

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

999

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

994

return errs

1000

return errs

995

1001

996

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

1002

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

997

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

1003

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

998

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

1004

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

999

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

1005

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

1000

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

1006

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

1001

1007

1002

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

1008

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

1003

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

1009

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

1004

if not rev:

1010

if not rev:

1005

rev = repo.changelog.tip()

1011

rev = repo.changelog.tip()

1006

else:

1012

else:

1007

rev = repo.lookup(rev)

1013

rev = repo.lookup(rev)

1008

change = repo.changelog.read(rev)

1014

change = repo.changelog.read(rev)

1009

n = change[0]

1015

n = change[0]

1010

files = repo.manifest.readflags(n)

1016

files = repo.manifest.readflags(n)

1011

wlock = repo.wlock()

1017

wlock = repo.wlock()

1012

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

1018

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

1013

1019

1014

def debugcheckstate(ui, repo):

1020

def debugcheckstate(ui, repo):

1015

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

1021

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

1016

parent1, parent2 = repo.dirstate.parents()

1022

parent1, parent2 = repo.dirstate.parents()

1017

repo.dirstate.read()

1023

repo.dirstate.read()

1018

dc = repo.dirstate.map

1024

dc = repo.dirstate.map

1019

keys = dc.keys()

1025

keys = dc.keys()

1020

keys.sort()

1026

keys.sort()

1021

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

1027

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

1022

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

1028

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

1023

m1 = repo.manifest.read(m1n)

1029

m1 = repo.manifest.read(m1n)

1024

m2 = repo.manifest.read(m2n)

1030

m2 = repo.manifest.read(m2n)

1025

errors = 0

1031

errors = 0

1026

for f in dc:

1032

for f in dc:

1027

state = repo.dirstate.state(f)

1033

state = repo.dirstate.state(f)

1028

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

1034

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

1029

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

1035

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

1030

errors += 1

1036

errors += 1

1031

if state in "a" and f in m1:

1037

if state in "a" and f in m1:

1032

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

1038

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

1033

errors += 1

1039

errors += 1

1034

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

1040

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

1035

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

1041

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

1036

(f, state))

1042

(f, state))

1037

errors += 1

1043

errors += 1

1038

for f in m1:

1044

for f in m1:

1039

state = repo.dirstate.state(f)

1045

state = repo.dirstate.state(f)

1040

if state not in "nrm":

1046

if state not in "nrm":

1041

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

1047

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

1042

errors += 1

1048

errors += 1

1043

if errors:

1049

if errors:

1044

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

1050

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

1045

raise util.Abort(error)

1051

raise util.Abort(error)

1046

1052

1047

def debugconfig(ui):

1053

def debugconfig(ui):

1048

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

1054

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

1049

try:

1055

try:

1050

repo = hg.repository(ui)

1056

repo = hg.repository(ui)

1051

except hg.RepoError:

1057

except hg.RepoError:

1052

pass

1058

pass

1053

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

1059

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

1054

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

1060

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

1055

1061

1056

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

1062

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

1057

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

1063

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

1058

1064

1059

This is useful for writing repository conversion tools, but should

1065

This is useful for writing repository conversion tools, but should

1060

be used with care.

1066

be used with care.

1061

"""

1067

"""

1062

1068

1063

if not rev2:

1069

if not rev2:

1064

rev2 = hex(nullid)

1070

rev2 = hex(nullid)

1065

1071

1066

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

1072

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

1067

1073

1068

def debugstate(ui, repo):

1074

def debugstate(ui, repo):

1069

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

1075

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

1070

repo.dirstate.read()

1076

repo.dirstate.read()

1071

dc = repo.dirstate.map

1077

dc = repo.dirstate.map

1072

keys = dc.keys()

1078

keys = dc.keys()

1073

keys.sort()

1079

keys.sort()

1074

for file_ in keys:

1080

for file_ in keys:

1075

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

1081

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

1076

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

1082

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

1077

time.strftime("%x %X",

1083

time.strftime("%x %X",

1078

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

1084

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

1079

for f in repo.dirstate.copies:

1085

for f in repo.dirstate.copies:

1080

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

1086

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

1081

1087

1082

def debugdata(ui, file_, rev):

1088

def debugdata(ui, file_, rev):

1083

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

1089

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

1084

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

1090

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

1085

try:

1091

try:

1086

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

1092

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

1087

except KeyError:

1093

except KeyError:

1088

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

1094

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

1089

1095

1090

def debugindex(ui, file_):

1096

def debugindex(ui, file_):

1091

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

1097

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

1092

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

1098

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

1093

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

1099

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

1094

" nodeid p1 p2\n")

1100

" nodeid p1 p2\n")

1095

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

1101

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

1096

e = r.index[i]

1102

e = r.index[i]

1097

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

1103

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

1098

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

1104

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

1099

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

1105

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

1100

1106

1101

def debugindexdot(ui, file_):

1107

def debugindexdot(ui, file_):

1102

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

1108

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

1103

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

1109

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

1104

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

1110

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

1105

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

1111

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

1106

e = r.index[i]

1112

e = r.index[i]

1107

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

1113

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

1108

if e[5] != nullid:

1114

if e[5] != nullid:

1109

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

1115

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

1110

ui.write("}\n")

1116

ui.write("}\n")

1111

1117

1112

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

1118

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

1113

"""dump rename information"""

1119

"""dump rename information"""

1114

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

1120

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

1115

if rev:

1121

if rev:

1116

try:

1122

try:

1117

# assume all revision numbers are for changesets

1123

# assume all revision numbers are for changesets

1118

n = repo.lookup(rev)

1124

n = repo.lookup(rev)

1119

change = repo.changelog.read(n)

1125

change = repo.changelog.read(n)

1120

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

1126

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

1121

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

1127

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

1122

except (hg.RepoError, KeyError):

1128

except (hg.RepoError, KeyError):

1123

n = r.lookup(rev)

1129

n = r.lookup(rev)

1124

else:

1130

else:

1125

n = r.tip()

1131

n = r.tip()

1126

m = r.renamed(n)

1132

m = r.renamed(n)

1127

if m:

1133

if m:

1128

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

1134

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

1129

else:

1135

else:

1130

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

1136

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

1131

1137

1132

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

1138

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

1133

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

1139

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

1134

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

1140

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

1135

if not items:

1141

if not items:

1136

return

1142

return

1137

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

1143

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

1138

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

1144

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

1139

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

1145

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

1140

for src, abs, rel, exact in items:

1146

for src, abs, rel, exact in items:

1141

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

1147

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

1142

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

1148

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

1143

1149

1144

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

1150

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

1145

"""diff repository (or selected files)

1151

"""diff repository (or selected files)

1146

1152

1147

Show differences between revisions for the specified files.

1153

Show differences between revisions for the specified files.

1148

1154

1149

Differences between files are shown using the unified diff format.

1155

Differences between files are shown using the unified diff format.

1150

1156

1151

When two revision arguments are given, then changes are shown

1157

When two revision arguments are given, then changes are shown

1152

between those revisions. If only one revision is specified then

1158

between those revisions. If only one revision is specified then

1153

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

1159

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

1154

revisions are specified, the working directory files are compared

1160

revisions are specified, the working directory files are compared

1155

to its parent.

1161

to its parent.

1156

1162

1157

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

1163

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

1158

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

1164

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

1159

probably with undesirable results.

1165

probably with undesirable results.

1160

"""

1166

"""

1161

node1, node2 = None, None

1167

node1, node2 = None, None

1162

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

1168

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

1163

1169

1164

if len(revs) > 0:

1170

if len(revs) > 0:

1165

node1 = revs[0]

1171

node1 = revs[0]

1166

if len(revs) > 1:

1172

if len(revs) > 1:

1167

node2 = revs[1]

1173

node2 = revs[1]

1168

if len(revs) > 2:

1174

if len(revs) > 2:

1169

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

1175

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

1170

1176

1171

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

1177

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

1172

1178

1173

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

1179

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

1174

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

1180

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

1175

1181

1176

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

1182

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

1177

node = repo.lookup(changeset)

1183

node = repo.lookup(changeset)

1178

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

1184

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

1179

if opts['switch_parent']:

1185

if opts['switch_parent']:

1180

parents.reverse()

1186

parents.reverse()

1181

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

1187

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

1182

change = repo.changelog.read(node)

1188

change = repo.changelog.read(node)

1183

1189

1184

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

1190

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

1185

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

1191

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

1186

revwidth=revwidth)

1192

revwidth=revwidth)

1187

if fp != sys.stdout:

1193

if fp != sys.stdout:

1188

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

1194

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

1189

1195

1190

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

1196

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

1191

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

1197

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

1192

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

1198

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

1193

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

1199

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

1194

if len(parents) > 1:

1200

if len(parents) > 1:

1195

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

1201

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

1196

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

1202

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

1197

fp.write("\n\n")

1203

fp.write("\n\n")

1198

1204

1199

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

1205

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

1200

if fp != sys.stdout:

1206

if fp != sys.stdout:

1201

fp.close()

1207

fp.close()

1202

1208

1203

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

1209

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

1204

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

1210

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

1205

1211

1206

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

1212

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

1207

1213

1208

The information shown in the changeset header is: author,

1214

The information shown in the changeset header is: author,

1209

changeset hash, parent and commit comment.

1215

changeset hash, parent and commit comment.

1210

1216

1211

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

1217

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

1212

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

1218

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

1213

1219

1214

%% literal "%" character

1220

%% literal "%" character

1215

%H changeset hash (40 bytes of hexadecimal)

1221

%H changeset hash (40 bytes of hexadecimal)

1216

%N number of patches being generated

1222

%N number of patches being generated

1217

%R changeset revision number

1223

%R changeset revision number

1218

%b basename of the exporting repository

1224

%b basename of the exporting repository

1219

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

1225

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

1220

%n zero-padded sequence number, starting at 1

1226

%n zero-padded sequence number, starting at 1

1221

%r zero-padded changeset revision number

1227

%r zero-padded changeset revision number

1222

1228

1223

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

1229

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

1224

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

1230

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

1225

probably with undesirable results.

1231

probably with undesirable results.

1226

1232

1227

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

1233

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

1228

parent. It can be useful to review a merge.

1234

parent. It can be useful to review a merge.

1229

"""

1235

"""

1230

if not changesets:

1236

if not changesets:

1231

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

1237

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

1232

seqno = 0

1238

seqno = 0

1233

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

1239

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

1234

total = len(revs)

1240

total = len(revs)

1235

revwidth = max(map(len, revs))

1241

revwidth = max(map(len, revs))

1236

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

1242

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

1237

ui.note(msg)

1243

ui.note(msg)

1238

for cset in revs:

1244

for cset in revs:

1239

seqno += 1

1245

seqno += 1

1240

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

1246

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

1241

1247

1242

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

1248

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

1243

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

1249

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

1244

1250

1245

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

1251

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

1246

"""

1252

"""

1247

forget = []

1253

forget = []

1248

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

1254

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

1249

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

1255

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

1250

forget.append(abs)

1256

forget.append(abs)

1251

if ui.verbose or not exact:

1257

if ui.verbose or not exact:

1252

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

1258

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

1253

repo.forget(forget)

1259

repo.forget(forget)

1254

1260

1255

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

1261

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

1256

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

1262

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

1257

1263

1258

Search revisions of files for a regular expression.

1264

Search revisions of files for a regular expression.

1259

1265

1260

This command behaves differently than Unix grep. It only accepts

1266

This command behaves differently than Unix grep. It only accepts

1261

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

1267

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

1262

working directory. It always prints the revision number in which

1268

working directory. It always prints the revision number in which

1263

a match appears.

1269

a match appears.

1264

1270

1265

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

1271

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

1266

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

1272

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

1267

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

1273

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

1268

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

1274

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

1269

use the --all flag.

1275

use the --all flag.

1270

"""

1276

"""

1271

reflags = 0

1277

reflags = 0

1272

if opts['ignore_case']:

1278

if opts['ignore_case']:

1273

reflags |= re.I

1279

reflags |= re.I

1274

regexp = re.compile(pattern, reflags)

1280

regexp = re.compile(pattern, reflags)

1275

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

1281

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

1276

if opts['print0']:

1282

if opts['print0']:

1277

sep = eol = '\0'

1283

sep = eol = '\0'

1278

1284

1279

fcache = {}

1285

fcache = {}

1280

def getfile(fn):

1286

def getfile(fn):

1281

if fn not in fcache:

1287

if fn not in fcache:

1282

fcache[fn] = repo.file(fn)

1288

fcache[fn] = repo.file(fn)

1283

return fcache[fn]

1289

return fcache[fn]

1284

1290

1285

def matchlines(body):

1291

def matchlines(body):

1286

begin = 0

1292

begin = 0

1287

linenum = 0

1293

linenum = 0

1288

while True:

1294

while True:

1289

match = regexp.search(body, begin)

1295

match = regexp.search(body, begin)

1290

if not match:

1296

if not match:

1291

break

1297

break

1292

mstart, mend = match.span()

1298

mstart, mend = match.span()

1293

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

1299

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

1294

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

1300

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

1295

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

1301

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

1296

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

1302

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

1297

begin = lend + 1

1303

begin = lend + 1

1298

1304

1299

class linestate(object):

1305

class linestate(object):

1300

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

1306

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

1301

self.line = line

1307

self.line = line

1302

self.linenum = linenum

1308

self.linenum = linenum

1303

self.colstart = colstart

1309

self.colstart = colstart

1304

self.colend = colend

1310

self.colend = colend

1305

def __eq__(self, other):

1311

def __eq__(self, other):

1306

return self.line == other.line

1312

return self.line == other.line

1307

def __hash__(self):

1313

def __hash__(self):

1308

return hash(self.line)

1314

return hash(self.line)

1309

1315

1310

matches = {}

1316

matches = {}

1311

def grepbody(fn, rev, body):

1317

def grepbody(fn, rev, body):

1312

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

1318

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

1313

m = matches[rev][fn]

1319

m = matches[rev][fn]

1314

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

1320

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

1315

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

1321

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

1316

m[s] = s

1322

m[s] = s

1317

1323

1318

# FIXME: prev isn't used, why ?

1324

# FIXME: prev isn't used, why ?

1319

prev = {}

1325

prev = {}

1320

ucache = {}

1326

ucache = {}

1321

def display(fn, rev, states, prevstates):

1327

def display(fn, rev, states, prevstates):

1322

diff = list(sets.Set(states).symmetric_difference(sets.Set(prevstates)))

1328

diff = list(sets.Set(states).symmetric_difference(sets.Set(prevstates)))

1323

diff.sort(lambda x, y: cmp(x.linenum, y.linenum))

1329

diff.sort(lambda x, y: cmp(x.linenum, y.linenum))

1324

counts = {'-': 0, '+': 0}

1330

counts = {'-': 0, '+': 0}

1325

filerevmatches = {}

1331

filerevmatches = {}

1326

for l in diff:

1332

for l in diff:

1327

if incrementing or not opts['all']:

1333

if incrementing or not opts['all']:

1328

change = ((l in prevstates) and '-') or '+'

1334

change = ((l in prevstates) and '-') or '+'

1329

r = rev

1335

r = rev

1330

else:

1336

else:

1331

change = ((l in states) and '-') or '+'

1337

change = ((l in states) and '-') or '+'

1332

r = prev[fn]

1338

r = prev[fn]

1333

cols = [fn, str(rev)]

1339

cols = [fn, str(rev)]

1334

if opts['line_number']:

1340

if opts['line_number']:

1335

cols.append(str(l.linenum))

1341

cols.append(str(l.linenum))

1336

if opts['all']:

1342

if opts['all']:

1337

cols.append(change)

1343

cols.append(change)

1338

if opts['user']:

1344

if opts['user']:

1339

cols.append(trimuser(ui, getchange(rev)[1], rev,

1345

cols.append(trimuser(ui, getchange(rev)[1], rev,

1340

ucache))

1346

ucache))

1341

if opts['files_with_matches']:

1347

if opts['files_with_matches']:

1342

c = (fn, rev)

1348

c = (fn, rev)

1343

if c in filerevmatches:

1349

if c in filerevmatches:

1344

continue

1350

continue

1345

filerevmatches[c] = 1

1351

filerevmatches[c] = 1

1346

else:

1352

else:

1347

cols.append(l.line)

1353

cols.append(l.line)

1348

ui.write(sep.join(cols), eol)

1354

ui.write(sep.join(cols), eol)

1349

counts[change] += 1

1355

counts[change] += 1

1350

return counts['+'], counts['-']

1356

return counts['+'], counts['-']

1351

1357

1352

fstate = {}

1358

fstate = {}

1353

skip = {}

1359

skip = {}

1354

changeiter, getchange, matchfn = walkchangerevs(ui, repo, pats, opts)

1360

changeiter, getchange, matchfn = walkchangerevs(ui, repo, pats, opts)

1355

count = 0

1361

count = 0

1356

incrementing = False

1362

incrementing = False

1357

for st, rev, fns in changeiter:

1363

for st, rev, fns in changeiter:

1358

if st == 'window':

1364

if st == 'window':

1359

incrementing = rev

1365

incrementing = rev

1360

matches.clear()

1366

matches.clear()

1361

elif st == 'add':

1367

elif st == 'add':

1362

change = repo.changelog.read(repo.lookup(str(rev)))

1368

change = repo.changelog.read(repo.lookup(str(rev)))

1363

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

1369

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

1364

matches[rev] = {}

1370

matches[rev] = {}

1365

for fn in fns:

1371

for fn in fns:

1366

if fn in skip:

1372

if fn in skip:

1367

continue

1373

continue

1368

fstate.setdefault(fn, {})

1374

fstate.setdefault(fn, {})

1369

try:

1375

try:

1370

grepbody(fn, rev, getfile(fn).read(mf[fn]))

1376

grepbody(fn, rev, getfile(fn).read(mf[fn]))

1371

except KeyError:

1377

except KeyError:

1372

pass

1378

pass

1373

elif st == 'iter':

1379

elif st == 'iter':

1374

states = matches[rev].items()

1380

states = matches[rev].items()

1375

states.sort()

1381

states.sort()

1376

for fn, m in states:

1382

for fn, m in states:

1377

if fn in skip:

1383

if fn in skip:

1378

continue

1384

continue

1379

if incrementing or not opts['all'] or fstate[fn]:

1385

if incrementing or not opts['all'] or fstate[fn]:

1380

pos, neg = display(fn, rev, m, fstate[fn])

1386

pos, neg = display(fn, rev, m, fstate[fn])

1381

count += pos + neg

1387

count += pos + neg

1382

if pos and not opts['all']:

1388

if pos and not opts['all']:

1383

skip[fn] = True

1389

skip[fn] = True

1384

fstate[fn] = m

1390

fstate[fn] = m

1385

prev[fn] = rev

1391

prev[fn] = rev

1386

1392

1387

if not incrementing:

1393

if not incrementing:

1388

fstate = fstate.items()

1394

fstate = fstate.items()

1389

fstate.sort()

1395

fstate.sort()

1390

for fn, state in fstate:

1396

for fn, state in fstate:

1391

if fn in skip:

1397

if fn in skip:

1392

continue

1398

continue

1393

display(fn, rev, {}, state)

1399

display(fn, rev, {}, state)

1394

return (count == 0 and 1) or 0

1400

return (count == 0 and 1) or 0

1395

1401

1396

def heads(ui, repo, **opts):

1402

def heads(ui, repo, **opts):

1397

"""show current repository heads

1403

"""show current repository heads

1398

1404

1399

Show all repository head changesets.

1405

Show all repository head changesets.

1400

1406

1401

Repository "heads" are changesets that don't have children

1407

Repository "heads" are changesets that don't have children

1402

changesets. They are where development generally takes place and

1408

changesets. They are where development generally takes place and

1403

are the usual targets for update and merge operations.

1409

are the usual targets for update and merge operations.

1404

"""

1410

"""

1405

if opts['rev']:

1411

if opts['rev']:

1406

heads = repo.heads(repo.lookup(opts['rev']))

1412

heads = repo.heads(repo.lookup(opts['rev']))

1407

else:

1413

else:

1408

heads = repo.heads()

1414

heads = repo.heads()

1409

br = None

1415

br = None

1410

if opts['branches']:

1416

if opts['branches']:

1411

br = repo.branchlookup(heads)

1417

br = repo.branchlookup(heads)

1412

for n in heads:

1418

for n in heads:

1413

show_changeset(ui, repo, changenode=n, brinfo=br)

1419

show_changeset(ui, repo, changenode=n, brinfo=br)

1414

1420

1415

def identify(ui, repo):

1421

def identify(ui, repo):

1416

"""print information about the working copy

1422

"""print information about the working copy

1417

1423

1418

Print a short summary of the current state of the repo.

1424

Print a short summary of the current state of the repo.

1419

1425

1420

This summary identifies the repository state using one or two parent

1426

This summary identifies the repository state using one or two parent

1421

hash identifiers, followed by a "+" if there are uncommitted changes

1427

hash identifiers, followed by a "+" if there are uncommitted changes

1422

in the working directory, followed by a list of tags for this revision.

1428

in the working directory, followed by a list of tags for this revision.

1423

"""

1429

"""

1424

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

1430

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

1425

if not parents:

1431

if not parents:

1426

ui.write(_("unknown\n"))

1432

ui.write(_("unknown\n"))

1427

return

1433

return

1428

1434

1429

hexfunc = ui.verbose and hex or short

1435

hexfunc = ui.verbose and hex or short

1430

modified, added, removed, deleted, unknown = repo.changes()

1436

modified, added, removed, deleted, unknown = repo.changes()

1431

output = ["%s%s" %

1437

output = ["%s%s" %

1432

('+'.join([hexfunc(parent) for parent in parents]),

1438

('+'.join([hexfunc(parent) for parent in parents]),

1433

(modified or added or removed or deleted) and "+" or "")]

1439

(modified or added or removed or deleted) and "+" or "")]

1434

1440

1435

if not ui.quiet:

1441

if not ui.quiet:

1436

# multiple tags for a single parent separated by '/'

1442

# multiple tags for a single parent separated by '/'

1437

parenttags = ['/'.join(tags)

1443

parenttags = ['/'.join(tags)

1438

for tags in map(repo.nodetags, parents) if tags]

1444

for tags in map(repo.nodetags, parents) if tags]

1439

# tags for multiple parents separated by ' + '

1445

# tags for multiple parents separated by ' + '

1440

if parenttags:

1446

if parenttags:

1441

output.append(' + '.join(parenttags))

1447

output.append(' + '.join(parenttags))

1442

1448

1443

ui.write("%s\n" % ' '.join(output))

1449

ui.write("%s\n" % ' '.join(output))

1444

1450

1445

def import_(ui, repo, patch1, *patches, **opts):

1451

def import_(ui, repo, patch1, *patches, **opts):

1446

"""import an ordered set of patches

1452

"""import an ordered set of patches

1447

1453

1448

Import a list of patches and commit them individually.

1454

Import a list of patches and commit them individually.

1449

1455

1450

If there are outstanding changes in the working directory, import

1456

If there are outstanding changes in the working directory, import

1451

will abort unless given the -f flag.

1457

will abort unless given the -f flag.

1452

1458

1453

If a patch looks like a mail message (its first line starts with

1459

If a patch looks like a mail message (its first line starts with

1454

"From " or looks like an RFC822 header), it will not be applied

1460

"From " or looks like an RFC822 header), it will not be applied

1455

unless the -f option is used. The importer neither parses nor

1461

unless the -f option is used. The importer neither parses nor

1456

discards mail headers, so use -f only to override the "mailness"

1462

discards mail headers, so use -f only to override the "mailness"

1457

safety check, not to import a real mail message.

1463

safety check, not to import a real mail message.

1458

"""

1464

"""

1459

patches = (patch1,) + patches

1465

patches = (patch1,) + patches

1460

1466

1461

if not opts['force']:

1467

if not opts['force']:

1462

modified, added, removed, deleted, unknown = repo.changes()

1468

modified, added, removed, deleted, unknown = repo.changes()

1463

if modified or added or removed or deleted:

1469

if modified or added or removed or deleted:

1464

raise util.Abort(_("outstanding uncommitted changes"))

1470

raise util.Abort(_("outstanding uncommitted changes"))

1465

1471

1466

d = opts["base"]

1472

d = opts["base"]

1467

strip = opts["strip"]

1473

strip = opts["strip"]

1468

1474

1469

mailre = re.compile(r'(?:From |[\w-]+:)')

1475

mailre = re.compile(r'(?:From |[\w-]+:)')

1470

1476

1471

# attempt to detect the start of a patch

1477

# attempt to detect the start of a patch

1472

# (this heuristic is borrowed from quilt)

1478

# (this heuristic is borrowed from quilt)

1473

diffre = re.compile(r'(?:Index:[ \t]|diff[ \t]|RCS file: |' +

1479

diffre = re.compile(r'(?:Index:[ \t]|diff[ \t]|RCS file: |' +

1474

'retrieving revision [0-9]+(\.[0-9]+)*$|' +

1480

'retrieving revision [0-9]+(\.[0-9]+)*$|' +

1475

'(---|\*\*\*)[ \t])')

1481

'(---|\*\*\*)[ \t])')

1476

1482

1477

for patch in patches:

1483

for patch in patches:

1478

ui.status(_("applying %s\n") % patch)

1484

ui.status(_("applying %s\n") % patch)

1479

pf = os.path.join(d, patch)

1485

pf = os.path.join(d, patch)

1480

1486

1481

message = []

1487

message = []

1482

user = None

1488

user = None

1483

hgpatch = False

1489

hgpatch = False

1484

for line in file(pf):

1490

for line in file(pf):

1485

line = line.rstrip()

1491

line = line.rstrip()

1486

if (not message and not hgpatch and

1492

if (not message and not hgpatch and

1487

mailre.match(line) and not opts['force']):

1493

mailre.match(line) and not opts['force']):

1488

if len(line) > 35:

1494

if len(line) > 35:

1489

line = line[:32] + '...'

1495

line = line[:32] + '...'

1490

raise util.Abort(_('first line looks like a '

1496

raise util.Abort(_('first line looks like a '

1491

'mail header: ') + line)

1497

'mail header: ') + line)

1492

if diffre.match(line):

1498

if diffre.match(line):

1493

break

1499

break

1494

elif hgpatch:

1500

elif hgpatch:

1495

# parse values when importing the result of an hg export

1501

# parse values when importing the result of an hg export

1496

if line.startswith("# User "):

1502

if line.startswith("# User "):

1497

user = line[7:]

1503

user = line[7:]

1498

ui.debug(_('User: %s\n') % user)

1504

ui.debug(_('User: %s\n') % user)

1499

elif not line.startswith("# ") and line:

1505

elif not line.startswith("# ") and line:

1500

message.append(line)

1506

message.append(line)

1501

hgpatch = False

1507

hgpatch = False

1502

elif line == '# HG changeset patch':

1508

elif line == '# HG changeset patch':

1503

hgpatch = True

1509

hgpatch = True

1504

message = [] # We may have collected garbage

1510

message = [] # We may have collected garbage

1505

else:

1511

else:

1506

message.append(line)

1512

message.append(line)

1507

1513

1508

# make sure message isn't empty

1514

# make sure message isn't empty

1509

if not message:

1515

if not message:

1510

message = _("imported patch %s\n") % patch

1516

message = _("imported patch %s\n") % patch

1511

else:

1517

else:

1512

message = "%s\n" % '\n'.join(message)

1518

message = "%s\n" % '\n'.join(message)

1513

ui.debug(_('message:\n%s\n') % message)

1519

ui.debug(_('message:\n%s\n') % message)

1514

1520

1515

files = util.patch(strip, pf, ui)

1521

files = util.patch(strip, pf, ui)

1516

1522

1517

if len(files) > 0:

1523

if len(files) > 0:

1518

addremove(ui, repo, *files)

1524

addremove(ui, repo, *files)

1519

repo.commit(files, message, user)

1525

repo.commit(files, message, user)

1520

1526

1521

def incoming(ui, repo, source="default", **opts):

1527

def incoming(ui, repo, source="default", **opts):

1522

"""show new changesets found in source

1528

"""show new changesets found in source

1523

1529

1524

Show new changesets found in the specified repo or the default

1530

Show new changesets found in the specified repo or the default

1525

pull repo. These are the changesets that would be pulled if a pull

1531

pull repo. These are the changesets that would be pulled if a pull

1526

was requested.

1532

was requested.

1527

1533

1528

Currently only local repositories are supported.

1534

Currently only local repositories are supported.

1529

"""

1535

"""

1530

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

1536

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

1531

other = hg.repository(ui, source)

1537

other = hg.repository(ui, source)

1532

if not other.local():

1538

if not other.local():

1533

raise util.Abort(_("incoming doesn't work for remote repositories yet"))

1539

raise util.Abort(_("incoming doesn't work for remote repositories yet"))

1534

o = repo.findincoming(other)

1540

o = repo.findincoming(other)

1535

if not o:

1541

if not o:

1536

return

1542

return

1537

o = other.changelog.nodesbetween(o)[0]

1543

o = other.changelog.nodesbetween(o)[0]

1538

if opts['newest_first']:

1544

if opts['newest_first']:

1539

o.reverse()

1545

o.reverse()

1540

for n in o:

1546

for n in o:

1541

parents = [p for p in other.changelog.parents(n) if p != nullid]

1547

parents = [p for p in other.changelog.parents(n) if p != nullid]

1542

if opts['no_merges'] and len(parents) == 2:

1548

if opts['no_merges'] and len(parents) == 2:

1543

continue

1549

continue

1544

show_changeset(ui, other, changenode=n)

1550

show_changeset(ui, other, changenode=n)

1545

if opts['patch']:

1551

if opts['patch']:

1546

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

1552

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

1547

dodiff(ui, ui, other, prev, n)

1553

dodiff(ui, ui, other, prev, n)

1548

ui.write("\n")

1554

ui.write("\n")

1549

1555

1550

def init(ui, dest="."):

1556

def init(ui, dest="."):

1551

"""create a new repository in the given directory

1557

"""create a new repository in the given directory

1552

1558

1553

Initialize a new repository in the given directory. If the given

1559

Initialize a new repository in the given directory. If the given

1554

directory does not exist, it is created.

1560

directory does not exist, it is created.

1555

1561

1556

If no directory is given, the current directory is used.

1562

If no directory is given, the current directory is used.

1557

"""

1563

"""

1558

if not os.path.exists(dest):

1564

if not os.path.exists(dest):

1559

os.mkdir(dest)

1565

os.mkdir(dest)

1560

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

1566

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

1561

1567

1562

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

1568

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

1563

"""locate files matching specific patterns

1569

"""locate files matching specific patterns

1564

1570

1565

Print all files under Mercurial control whose names match the

1571

Print all files under Mercurial control whose names match the

1566

given patterns.

1572

given patterns.

1567

1573

1568

This command searches the current directory and its

1574

This command searches the current directory and its

1569

subdirectories. To search an entire repository, move to the root

1575

subdirectories. To search an entire repository, move to the root

1570

of the repository.

1576

of the repository.

1571

1577

1572

If no patterns are given to match, this command prints all file

1578

If no patterns are given to match, this command prints all file

1573

names.

1579

names.

1574

1580

1575

If you want to feed the output of this command into the "xargs"

1581

If you want to feed the output of this command into the "xargs"

1576

command, use the "-0" option to both this command and "xargs".

1582

command, use the "-0" option to both this command and "xargs".

1577

This will avoid the problem of "xargs" treating single filenames

1583

This will avoid the problem of "xargs" treating single filenames

1578

that contain white space as multiple filenames.

1584

that contain white space as multiple filenames.

1579

"""

1585

"""

1580

end = opts['print0'] and '\0' or '\n'

1586

end = opts['print0'] and '\0' or '\n'

1581

rev = opts['rev']

1587

rev = opts['rev']

1582

if rev:

1588

if rev:

1583

node = repo.lookup(rev)

1589

node = repo.lookup(rev)

1584

else:

1590

else:

1585

node = None

1591

node = None

1586

1592

1587

for src, abs, rel, exact in walk(repo, pats, opts, node=node,

1593

for src, abs, rel, exact in walk(repo, pats, opts, node=node,

1588

head='(?:.*/|)'):

1594

head='(?:.*/|)'):

1589

if not node and repo.dirstate.state(abs) == '?':

1595

if not node and repo.dirstate.state(abs) == '?':

1590

continue

1596

continue

1591

if opts['fullpath']:

1597

if opts['fullpath']:

1592

ui.write(os.path.join(repo.root, abs), end)

1598

ui.write(os.path.join(repo.root, abs), end)

1593

else:

1599

else:

1594

ui.write(((pats and rel) or abs), end)

1600

ui.write(((pats and rel) or abs), end)

1595

1601

1596

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

1602

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

1597

"""show revision history of entire repository or files

1603

"""show revision history of entire repository or files

1598

1604

1599

Print the revision history of the specified files or the entire project.

1605

Print the revision history of the specified files or the entire project.

1600

1606

1601

By default this command outputs: changeset id and hash, tags,

1607

By default this command outputs: changeset id and hash, tags,

1602

non-trivial parents, user, date and time, and a summary for each

1608

non-trivial parents, user, date and time, and a summary for each

1603

commit. When the -v/--verbose switch is used, the list of changed

1609

commit. When the -v/--verbose switch is used, the list of changed

1604

files and full commit message is shown.

1610

files and full commit message is shown.

1605

"""

1611

"""

1606

class dui(object):

1612

class dui(object):

1607

# Implement and delegate some ui protocol. Save hunks of

1613

# Implement and delegate some ui protocol. Save hunks of

1608

# output for later display in the desired order.

1614

# output for later display in the desired order.

1609

def __init__(self, ui):

1615

def __init__(self, ui):

1610

self.ui = ui

1616

self.ui = ui

1611

self.hunk = {}

1617

self.hunk = {}

1612

def bump(self, rev):

1618

def bump(self, rev):

1613

self.rev = rev

1619

self.rev = rev

1614

self.hunk[rev] = []

1620

self.hunk[rev] = []

1615

def note(self, *args):

1621

def note(self, *args):

1616

if self.verbose:

1622

if self.verbose:

1617

self.write(*args)

1623

self.write(*args)

1618

def status(self, *args):

1624

def status(self, *args):

1619

if not self.quiet:

1625

if not self.quiet:

1620

self.write(*args)

1626

self.write(*args)

1621

def write(self, *args):

1627

def write(self, *args):

1622

self.hunk[self.rev].append(args)

1628

self.hunk[self.rev].append(args)

1623

def debug(self, *args):

1629

def debug(self, *args):

1624

if self.debugflag:

1630

if self.debugflag:

1625

self.write(*args)

1631

self.write(*args)

1626

def __getattr__(self, key):

1632

def __getattr__(self, key):

1627

return getattr(self.ui, key)

1633

return getattr(self.ui, key)

1628

1634

1629

changeiter, getchange, matchfn = walkchangerevs(ui, repo, pats, opts)

1635

changeiter, getchange, matchfn = walkchangerevs(ui, repo, pats, opts)

1630

1636

1631

if opts['limit']:

1637

if opts['limit']:

1632

try:

1638

try:

1633

limit = int(opts['limit'])

1639

limit = int(opts['limit'])

1634

except ValueError:

1640

except ValueError:

1635

raise util.Abort(_('limit must be a positive integer'))

1641

raise util.Abort(_('limit must be a positive integer'))

1636

if limit <= 0: raise util.Abort(_('limit must be positive'))

1642

if limit <= 0: raise util.Abort(_('limit must be positive'))

1637

else:

1643

else:

1638

limit = sys.maxint

1644

limit = sys.maxint

1639

count = 0

1645

count = 0

1640

1646

1641

for st, rev, fns in changeiter:

1647

for st, rev, fns in changeiter:

1642

if st == 'window':

1648

if st == 'window':

1643

du = dui(ui)

1649

du = dui(ui)

1644

elif st == 'add':

1650

elif st == 'add':

1645

du.bump(rev)

1651

du.bump(rev)

1646

changenode = repo.changelog.node(rev)

1652

changenode = repo.changelog.node(rev)

1647

parents = [p for p in repo.changelog.parents(changenode)

1653

parents = [p for p in repo.changelog.parents(changenode)

1648

if p != nullid]

1654

if p != nullid]

1649

if opts['no_merges'] and len(parents) == 2:

1655

if opts['no_merges'] and len(parents) == 2:

1650

continue

1656

continue

1651

if opts['only_merges'] and len(parents) != 2:

1657

if opts['only_merges'] and len(parents) != 2:

1652

continue

1658

continue

1653

1659

1654

if opts['keyword']:

1660

if opts['keyword']:

1655

changes = getchange(rev)

1661

changes = getchange(rev)

1656

miss = 0

1662

miss = 0

1657

for k in [kw.lower() for kw in opts['keyword']]:

1663

for k in [kw.lower() for kw in opts['keyword']]:

1658

if not (k in changes[1].lower() or

1664

if not (k in changes[1].lower() or

1659

k in changes[4].lower() or

1665

k in changes[4].lower() or

1660

k in " ".join(changes[3][:20]).lower()):

1666

k in " ".join(changes[3][:20]).lower()):

1661

miss = 1

1667

miss = 1

1662

break

1668

break

1663

if miss:

1669

if miss:

1664

continue

1670

continue

1665

1671

1666

br = None

1672

br = None

1667

if opts['branches']:

1673

if opts['branches']:

1668

br = repo.branchlookup([repo.changelog.node(rev)])

1674

br = repo.branchlookup([repo.changelog.node(rev)])

1669

1675

1670

show_changeset(du, repo, rev, brinfo=br)

1676

show_changeset(du, repo, rev, brinfo=br)

1671

if opts['patch']:

1677

if opts['patch']:

1672

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

1678

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

1673

dodiff(du, du, repo, prev, changenode, match=matchfn)

1679

dodiff(du, du, repo, prev, changenode, match=matchfn)

1674

du.write("\n\n")

1680

du.write("\n\n")

1675

elif st == 'iter':

1681

elif st == 'iter':

1676

if count == limit: break

1682

if count == limit: break

1677

if du.hunk[rev]:

1683

if du.hunk[rev]:

1678

count += 1

1684

count += 1

1679

for args in du.hunk[rev]:

1685

for args in du.hunk[rev]:

1680

ui.write(*args)

1686

ui.write(*args)

1681

1687

1682

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

1688

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

1683

"""output the latest or given revision of the project manifest

1689

"""output the latest or given revision of the project manifest

1684

1690

1685

Print a list of version controlled files for the given revision.

1691

Print a list of version controlled files for the given revision.

1686

1692

1687

The manifest is the list of files being version controlled. If no revision

1693

The manifest is the list of files being version controlled. If no revision

1688

is given then the tip is used.

1694

is given then the tip is used.

1689

"""

1695

"""

1690

if rev:

1696

if rev:

1691

try:

1697

try:

1692

# assume all revision numbers are for changesets

1698

# assume all revision numbers are for changesets

1693

n = repo.lookup(rev)

1699

n = repo.lookup(rev)

1694

change = repo.changelog.read(n)

1700

change = repo.changelog.read(n)

1695

n = change[0]

1701

n = change[0]

1696

except hg.RepoError:

1702

except hg.RepoError:

1697

n = repo.manifest.lookup(rev)

1703

n = repo.manifest.lookup(rev)

1698

else:

1704

else:

1699

n = repo.manifest.tip()

1705

n = repo.manifest.tip()

1700

m = repo.manifest.read(n)

1706

m = repo.manifest.read(n)

1701

mf = repo.manifest.readflags(n)

1707

mf = repo.manifest.readflags(n)

1702

files = m.keys()

1708

files = m.keys()

1703

files.sort()

1709

files.sort()

1704

1710

1705

for f in files:

1711

for f in files:

1706

ui.write("%40s %3s %s\n" % (hex(m[f]), mf[f] and "755" or "644", f))

1712

ui.write("%40s %3s %s\n" % (hex(m[f]), mf[f] and "755" or "644", f))

1707

1713

1708

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

1714

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

1709

"""show changesets not found in destination

1715

"""show changesets not found in destination

1710

1716

1711

Show changesets not found in the specified destination repo or the

1717

Show changesets not found in the specified destination repo or the

1712

default push repo. These are the changesets that would be pushed

1718

default push repo. These are the changesets that would be pushed

1713

if a push was requested.

1719

if a push was requested.

1714

"""

1720

"""

1715

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

1721

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

1716

other = hg.repository(ui, dest)

1722

other = hg.repository(ui, dest)

1717

o = repo.findoutgoing(other)

1723

o = repo.findoutgoing(other)

1718

o = repo.changelog.nodesbetween(o)[0]

1724

o = repo.changelog.nodesbetween(o)[0]

1719

if opts['newest_first']:

1725

if opts['newest_first']:

1720

o.reverse()

1726

o.reverse()

1721

for n in o:

1727

for n in o:

1722

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]

1723

if opts['no_merges'] and len(parents) == 2:

1729

if opts['no_merges'] and len(parents) == 2:

1724

continue

1730

continue

1725

show_changeset(ui, repo, changenode=n)

1731

show_changeset(ui, repo, changenode=n)

1726

if opts['patch']:

1732

if opts['patch']:

1727

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

1733

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

1728

dodiff(ui, ui, repo, prev, n)

1734

dodiff(ui, ui, repo, prev, n)

1729

ui.write("\n")

1735

ui.write("\n")

1730

1736

1731

def parents(ui, repo, rev=None, branches=None):

1737

def parents(ui, repo, rev=None, branches=None):

1732

"""show the parents of the working dir or revision

1738

"""show the parents of the working dir or revision

1733

1739

1734

Print the working directory's parent revisions.

1740

Print the working directory's parent revisions.

1735

"""

1741

"""

1736

if rev:

1742

if rev:

1737

p = repo.changelog.parents(repo.lookup(rev))

1743

p = repo.changelog.parents(repo.lookup(rev))

1738

else:

1744

else:

1739

p = repo.dirstate.parents()

1745

p = repo.dirstate.parents()

1740

1746

1741

br = None

1747

br = None

1742

if branches is not None:

1748

if branches is not None:

1743

br = repo.branchlookup(p)

1749

br = repo.branchlookup(p)

1744

for n in p:

1750

for n in p:

1745

if n != nullid:

1751

if n != nullid:

1746

show_changeset(ui, repo, changenode=n, brinfo=br)

1752

show_changeset(ui, repo, changenode=n, brinfo=br)

1747

1753

1748

def paths(ui, search=None):

1754

def paths(ui, search=None):

1749

"""show definition of symbolic path names

1755

"""show definition of symbolic path names

1750

1756

1751

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

1752

definition of available names.

1758

definition of available names.

1753

1759

1754

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

1755

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.

1756

"""

1762

"""

1757

try:

1763

try:

1758

repo = hg.repository(ui=ui)

1764

repo = hg.repository(ui=ui)

1759

except hg.RepoError:

1765

except hg.RepoError:

1760

pass

1766

pass

1761

1767

1762

if search:

1768

if search:

1763

for name, path in ui.configitems("paths"):

1769

for name, path in ui.configitems("paths"):

1764

if name == search:

1770

if name == search:

1765

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

1771

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

1766

return

1772

return

1767

ui.warn(_("not found!\n"))

1773

ui.warn(_("not found!\n"))

1768

return 1

1774

return 1

1769

else:

1775

else:

1770

for name, path in ui.configitems("paths"):

1776

for name, path in ui.configitems("paths"):

1771

ui.write("%s = %s\n" % (name, path))

1777

ui.write("%s = %s\n" % (name, path))

1772

1778

1773

def pull(ui, repo, source="default", **opts):

1779

def pull(ui, repo, source="default", **opts):

1774

"""pull changes from the specified source

1780

"""pull changes from the specified source

1775

1781

1776

Pull changes from a remote repository to a local one.

1782

Pull changes from a remote repository to a local one.

1777

1783

1778

This finds all changes from the repository at the specified path

1784

This finds all changes from the repository at the specified path

1779

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

1780

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.

1781

1787

1782

Valid URLs are of the form:

1788

Valid URLs are of the form:

1783

1789

1784

local/filesystem/path

1790

local/filesystem/path

1785

http://[user@]host[:port][/path]

1791

http://[user@]host[:port][/path]

1786

https://[user@]host[:port][/path]

1792

https://[user@]host[:port][/path]

1787

ssh://[user@]host[:port][/path]

1793

ssh://[user@]host[:port][/path]

1788

1794

1789

SSH requires an accessible shell account on the destination machine

1795

SSH requires an accessible shell account on the destination machine

1790

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

1791

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

1792

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.

1793

"""

1799

"""

1794

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

1800

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

1795

ui.status(_('pulling from %s\n') % (source))

1801

ui.status(_('pulling from %s\n') % (source))

1796

1802

1797

if opts['ssh']:

1803

if opts['ssh']:

1798

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

1804

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

1799

if opts['remotecmd']:

1805

if opts['remotecmd']:

1800

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

1806

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

1801

1807

1802

other = hg.repository(ui, source)

1808

other = hg.repository(ui, source)

1803

revs = None

1809

revs = None

1804

if opts['rev'] and not other.local():

1810

if opts['rev'] and not other.local():

1805

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"))

1806

elif opts['rev']:

1812

elif opts['rev']:

1807

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

1813

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

1808

r = repo.pull(other, heads=revs)

1814

r = repo.pull(other, heads=revs)

1809

if not r:

1815

if not r:

1810

if opts['update']:

1816

if opts['update']:

1811

return update(ui, repo)

1817

return update(ui, repo)

1812

else:

1818

else:

1813

ui.status(_("(run 'hg update' to get a working copy)\n"))

1819

ui.status(_("(run 'hg update' to get a working copy)\n"))

1814

1820

1815

return r

1821

return r

1816

1822

1817

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

1823

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

1818

"""push changes to the specified destination

1824

"""push changes to the specified destination

1819

1825

1820

Push changes from the local repository to the given destination.

1826

Push changes from the local repository to the given destination.

1821

1827

1822

This is the symmetrical operation for pull. It helps to move

1828

This is the symmetrical operation for pull. It helps to move

1823

changes from the current repository to a different one. If the

1829

changes from the current repository to a different one. If the

1824

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

1825

from the current one.

1831

from the current one.

1826

1832

1827

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

1828

increase the number of remote heads. This generally indicates the

1834

increase the number of remote heads. This generally indicates the

1829

the client has forgotten to sync and merge before pushing.

1835

the client has forgotten to sync and merge before pushing.

1830

1836

1831

Valid URLs are of the form:

1837

Valid URLs are of the form:

1832

1838

1833

local/filesystem/path

1839

local/filesystem/path

1834

ssh://[user@]host[:port][/path]

1840

ssh://[user@]host[:port][/path]

1835

1841

1836

SSH requires an accessible shell account on the destination

1842

SSH requires an accessible shell account on the destination

1837

machine and a copy of hg in the remote path.

1843

machine and a copy of hg in the remote path.

1838

"""

1844

"""

1839

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

1845

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

1840

ui.status('pushing to %s\n' % (dest))

1846

ui.status('pushing to %s\n' % (dest))

1841

1847

1842

if opts['ssh']:

1848

if opts['ssh']:

1843

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

1849

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

1844

if opts['remotecmd']:

1850

if opts['remotecmd']:

1845

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

1851

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

1846

1852

1847

other = hg.repository(ui, dest)

1853

other = hg.repository(ui, dest)

1848

revs = None

1854

revs = None

1849

if opts['rev']:

1855

if opts['rev']:

1850

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

1856

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

1851

r = repo.push(other, opts['force'], revs=revs)

1857

r = repo.push(other, opts['force'], revs=revs)

1852

return r

1858

return r

1853

1859

1854

def rawcommit(ui, repo, *flist, **rc):

1860

def rawcommit(ui, repo, *flist, **rc):

1855

"""raw commit interface (DEPRECATED)

1861

"""raw commit interface (DEPRECATED)

1856

1862

1857

Lowlevel commit, for use in helper scripts.

1863

Lowlevel commit, for use in helper scripts.

1858

1864

1859

This command is not intended to be used by normal users, as it is

1865

This command is not intended to be used by normal users, as it is

1860

primarily useful for importing from other SCMs.

1866

primarily useful for importing from other SCMs.

1861

1867

1862

This command is now deprecated and will be removed in a future

1868

This command is now deprecated and will be removed in a future

1863

release, please use debugsetparents and commit instead.

1869

release, please use debugsetparents and commit instead.

1864

"""

1870

"""

1865

1871

1866

ui.warn(_("(the rawcommit command is deprecated)\n"))

1872

ui.warn(_("(the rawcommit command is deprecated)\n"))

1867

1873

1868

message = rc['message']

1874

message = rc['message']

1869

if not message and rc['logfile']:

1875

if not message and rc['logfile']:

1870

try:

1876

try:

1871

message = open(rc['logfile']).read()

1877

message = open(rc['logfile']).read()

1872

except IOError:

1878

except IOError:

1873

pass

1879

pass

1874

if not message and not rc['logfile']:

1880

if not message and not rc['logfile']:

1875

raise util.Abort(_("missing commit message"))

1881

raise util.Abort(_("missing commit message"))

1876

1882

1877

files = relpath(repo, list(flist))

1883

files = relpath(repo, list(flist))

1878

if rc['files']:

1884

if rc['files']:

1879

files += open(rc['files']).read().splitlines()

1885

files += open(rc['files']).read().splitlines()

1880

1886

1881

rc['parent'] = map(repo.lookup, rc['parent'])

1887

rc['parent'] = map(repo.lookup, rc['parent'])

1882

1888

1883

try:

1889

try:

1884

repo.rawcommit(files, message, rc['user'], rc['date'], *rc['parent'])

1890

repo.rawcommit(files, message, rc['user'], rc['date'], *rc['parent'])

1885

except ValueError, inst:

1891

except ValueError, inst:

1886

raise util.Abort(str(inst))

1892

raise util.Abort(str(inst))

1887

1893

1888

def recover(ui, repo):

1894

def recover(ui, repo):

1889

"""roll back an interrupted transaction

1895

"""roll back an interrupted transaction

1890

1896

1891

Recover from an interrupted commit or pull.

1897

Recover from an interrupted commit or pull.

1892

1898

1893

This command tries to fix the repository status after an interrupted

1899

This command tries to fix the repository status after an interrupted

1894

operation. It should only be necessary when Mercurial suggests it.

1900

operation. It should only be necessary when Mercurial suggests it.

1895

"""

1901

"""

1896

if repo.recover():

1902

if repo.recover():

1897

return repo.verify()

1903

return repo.verify()

1898

return False

1904

return False

1899

1905

1900

def remove(ui, repo, pat, *pats, **opts):

1906

def remove(ui, repo, pat, *pats, **opts):

1901

"""remove the specified files on the next commit

1907

"""remove the specified files on the next commit

1902

1908

1903

Schedule the indicated files for removal from the repository.

1909

Schedule the indicated files for removal from the repository.

1904

1910

1905

This command schedules the files to be removed at the next commit.

1911

This command schedules the files to be removed at the next commit.

1906

This only removes files from the current branch, not from the

1912

This only removes files from the current branch, not from the

1907

entire project history. If the files still exist in the working

1913

entire project history. If the files still exist in the working

1908

directory, they will be deleted from it.

1914

directory, they will be deleted from it.

1909

"""

1915

"""

1910

names = []

1916

names = []

1911

def okaytoremove(abs, rel, exact):

1917

def okaytoremove(abs, rel, exact):

1912

modified, added, removed, deleted, unknown = repo.changes(files=[abs])

1918

modified, added, removed, deleted, unknown = repo.changes(files=[abs])

1913

reason = None

1919

reason = None

1914

if modified:

1920

if modified:

1915

reason = _('is modified')

1921

reason = _('is modified')

1916

elif added:

1922

elif added:

1917

reason = _('has been marked for add')

1923

reason = _('has been marked for add')

1918

elif unknown:

1924

elif unknown:

1919

reason = _('is not managed')

1925

reason = _('is not managed')

1920

if reason:

1926

if reason:

1921

if exact:

1927

if exact:

1922

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

1928

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

1923

else:

1929

else:

1924

return True

1930

return True

1925

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

1931

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

1926

if okaytoremove(abs, rel, exact):

1932

if okaytoremove(abs, rel, exact):

1927

if ui.verbose or not exact:

1933

if ui.verbose or not exact:

1928

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

1934

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

1929

names.append(abs)

1935

names.append(abs)

1930

repo.remove(names, unlink=True)

1936

repo.remove(names, unlink=True)

1931

1937

1932

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

1938

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

1933

"""rename files; equivalent of copy + remove

1939

"""rename files; equivalent of copy + remove

1934

1940

1935

Mark dest as copies of sources; mark sources for deletion. If

1941

Mark dest as copies of sources; mark sources for deletion. If

1936

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

1942

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

1937

a file, there can only be one source.

1943

a file, there can only be one source.

1938

1944

1939

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

1945

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

1940

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

1946

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

1941

operation is recorded, but no copying is performed.

1947

operation is recorded, but no copying is performed.

1942

1948

1943

This command takes effect in the next commit.

1949

This command takes effect in the next commit.

1944

1950

1945

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

1951

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

1946

should properly record rename files, this information is not yet

1952

should properly record rename files, this information is not yet

1947

fully used by merge, nor fully reported by log.

1953

fully used by merge, nor fully reported by log.

1948

"""

1954

"""

1949

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

1955

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

1950

names = []

1956

names = []

1951

for abs, rel, exact in copied:

1957

for abs, rel, exact in copied:

1952

if ui.verbose or not exact:

1958

if ui.verbose or not exact:

1953

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

1959

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

1954

names.append(abs)

1960

names.append(abs)

1955

repo.remove(names, unlink=True)

1961

repo.remove(names, unlink=True)

1956

return errs

1962

return errs

1957

1963

1958

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

1964

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

1959

"""revert modified files or dirs back to their unmodified states

1965

"""revert modified files or dirs back to their unmodified states

1960

1966

1961

Revert any uncommitted modifications made to the named files or

1967

Revert any uncommitted modifications made to the named files or

1962

directories. This restores the contents of the affected files to

1968

directories. This restores the contents of the affected files to

1963

an unmodified state.

1969

an unmodified state.

1964

1970

1965

If a file has been deleted, it is recreated. If the executable

1971

If a file has been deleted, it is recreated. If the executable

1966

mode of a file was changed, it is reset.

1972

mode of a file was changed, it is reset.

1967

1973

1968

If names are given, all files matching the names are reverted.

1974

If names are given, all files matching the names are reverted.

1969

1975

1970

If no arguments are given, all files in the repository are reverted.

1976

If no arguments are given, all files in the repository are reverted.

1971

"""

1977

"""

1972

node = opts['rev'] and repo.lookup(opts['rev']) or \

1978

node = opts['rev'] and repo.lookup(opts['rev']) or \

1973

repo.dirstate.parents()[0]

1979

repo.dirstate.parents()[0]

1974

1980

1975

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

1981

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

1976

modified, added, removed, deleted, unknown = repo.changes(match=choose)

1982

modified, added, removed, deleted, unknown = repo.changes(match=choose)

1977

repo.forget(added)

1983

repo.forget(added)

1978

repo.undelete(removed)

1984

repo.undelete(removed)

1979

1985

1980

return repo.update(node, False, True, choose, False)

1986

return repo.update(node, False, True, choose, False)

1981

1987

1982

def root(ui, repo):

1988

def root(ui, repo):

1983

"""print the root (top) of the current working dir

1989

"""print the root (top) of the current working dir

1984

1990

1985

Print the root directory of the current repository.

1991

Print the root directory of the current repository.

1986

"""

1992

"""

1987

ui.write(repo.root + "\n")

1993

ui.write(repo.root + "\n")

1988

1994

1989

def serve(ui, repo, **opts):

1995

def serve(ui, repo, **opts):

1990

"""export the repository via HTTP

1996

"""export the repository via HTTP

1991

1997

1992

Start a local HTTP repository browser and pull server.

1998

Start a local HTTP repository browser and pull server.

1993

1999

1994

By default, the server logs accesses to stdout and errors to

2000

By default, the server logs accesses to stdout and errors to

1995

stderr. Use the "-A" and "-E" options to log to files.

2001

stderr. Use the "-A" and "-E" options to log to files.

1996

"""

2002

"""

1997

2003

1998

if opts["stdio"]:

2004

if opts["stdio"]:

1999

fin, fout = sys.stdin, sys.stdout

2005

fin, fout = sys.stdin, sys.stdout

2000

sys.stdout = sys.stderr

2006

sys.stdout = sys.stderr

2001

2007

2002

# Prevent insertion/deletion of CRs

2008

# Prevent insertion/deletion of CRs

2003

util.set_binary(fin)

2009

util.set_binary(fin)

2004

util.set_binary(fout)

2010

util.set_binary(fout)

2005

2011

2006

def getarg():

2012

def getarg():

2007

argline = fin.readline()[:-1]

2013

argline = fin.readline()[:-1]

2008

arg, l = argline.split()

2014

arg, l = argline.split()

2009

val = fin.read(int(l))

2015

val = fin.read(int(l))

2010

return arg, val

2016

return arg, val

2011

def respond(v):

2017

def respond(v):

2012

fout.write("%d\n" % len(v))

2018

fout.write("%d\n" % len(v))

2013

fout.write(v)

2019

fout.write(v)

2014

fout.flush()

2020

fout.flush()

2015

2021

2016

lock = None

2022

lock = None

2017

2023

2018

while 1:

2024

while 1:

2019

cmd = fin.readline()[:-1]

2025

cmd = fin.readline()[:-1]

2020

if cmd == '':

2026

if cmd == '':

2021

return

2027

return

2022

if cmd == "heads":

2028

if cmd == "heads":

2023

h = repo.heads()

2029

h = repo.heads()

2024

respond(" ".join(map(hex, h)) + "\n")

2030

respond(" ".join(map(hex, h)) + "\n")

2025

if cmd == "lock":

2031

if cmd == "lock":

2026

lock = repo.lock()

2032

lock = repo.lock()

2027

respond("")

2033

respond("")

2028

if cmd == "unlock":

2034

if cmd == "unlock":

2029

if lock:

2035

if lock:

2030

lock.release()

2036

lock.release()

2031

lock = None

2037

lock = None

2032

respond("")

2038

respond("")

2033

elif cmd == "branches":

2039

elif cmd == "branches":

2034

arg, nodes = getarg()

2040

arg, nodes = getarg()

2035

nodes = map(bin, nodes.split(" "))

2041

nodes = map(bin, nodes.split(" "))

2036

r = []

2042

r = []

2037

for b in repo.branches(nodes):

2043

for b in repo.branches(nodes):

2038

r.append(" ".join(map(hex, b)) + "\n")

2044

r.append(" ".join(map(hex, b)) + "\n")

2039

respond("".join(r))

2045

respond("".join(r))

2040

elif cmd == "between":

2046

elif cmd == "between":

2041

arg, pairs = getarg()

2047

arg, pairs = getarg()

2042

pairs = [map(bin, p.split("-")) for p in pairs.split(" ")]

2048

pairs = [map(bin, p.split("-")) for p in pairs.split(" ")]

2043

r = []

2049

r = []

2044

for b in repo.between(pairs):

2050

for b in repo.between(pairs):

2045

r.append(" ".join(map(hex, b)) + "\n")

2051

r.append(" ".join(map(hex, b)) + "\n")

2046

respond("".join(r))

2052

respond("".join(r))

2047

elif cmd == "changegroup":

2053

elif cmd == "changegroup":

2048

nodes = []

2054

nodes = []

2049

arg, roots = getarg()

2055

arg, roots = getarg()

2050

nodes = map(bin, roots.split(" "))

2056

nodes = map(bin, roots.split(" "))

2051

2057

2052

cg = repo.changegroup(nodes, 'serve')

2058

cg = repo.changegroup(nodes, 'serve')

2053

while 1:

2059

while 1:

2054

d = cg.read(4096)

2060

d = cg.read(4096)

2055

if not d:

2061

if not d:

2056

break

2062

break

2057

fout.write(d)

2063

fout.write(d)

2058

2064

2059

fout.flush()

2065

fout.flush()

2060

2066

2061

elif cmd == "addchangegroup":

2067

elif cmd == "addchangegroup":

2062

if not lock:

2068

if not lock:

2063

respond("not locked")

2069

respond("not locked")

2064

continue

2070

continue

2065

respond("")

2071

respond("")

2066

2072

2067

r = repo.addchangegroup(fin)

2073

r = repo.addchangegroup(fin)

2068

respond("")

2074

respond("")

2069

2075

2070

optlist = "name templates style address port ipv6 accesslog errorlog"

2076

optlist = "name templates style address port ipv6 accesslog errorlog"

2071

for o in optlist.split():

2077

for o in optlist.split():

2072

if opts[o]:

2078

if opts[o]:

2073

ui.setconfig("web", o, opts[o])

2079

ui.setconfig("web", o, opts[o])

2074

2080

2075

if opts['daemon'] and not opts['daemon_pipefds']:

2081

if opts['daemon'] and not opts['daemon_pipefds']:

2076

rfd, wfd = os.pipe()

2082

rfd, wfd = os.pipe()

2077

args = sys.argv[:]

2083

args = sys.argv[:]

2078

args.append('--daemon-pipefds=%d,%d' % (rfd, wfd))

2084

args.append('--daemon-pipefds=%d,%d' % (rfd, wfd))

2079

pid = os.spawnvp(os.P_NOWAIT | getattr(os, 'P_DETACH', 0),

2085

pid = os.spawnvp(os.P_NOWAIT | getattr(os, 'P_DETACH', 0),

2080

args[0], args)

2086

args[0], args)

2081

os.close(wfd)

2087

os.close(wfd)

2082

os.read(rfd, 1)

2088

os.read(rfd, 1)

2083

os._exit(0)

2089

os._exit(0)

2084

2090

2085

try:

2091

try:

2086

httpd = hgweb.create_server(repo)

2092

httpd = hgweb.create_server(repo)

2087

except socket.error, inst:

2093

except socket.error, inst:

2088

raise util.Abort(_('cannot start server: ') + inst.args[1])

2094

raise util.Abort(_('cannot start server: ') + inst.args[1])

2089

2095

2090

if ui.verbose:

2096

if ui.verbose:

2091

addr, port = httpd.socket.getsockname()

2097

addr, port = httpd.socket.getsockname()

2092

if addr == '0.0.0.0':

2098

if addr == '0.0.0.0':

2093

addr = socket.gethostname()

2099

addr = socket.gethostname()

2094

else:

2100

else:

2095

try:

2101

try:

2096

addr = socket.gethostbyaddr(addr)[0]

2102

addr = socket.gethostbyaddr(addr)[0]

2097

except socket.error:

2103

except socket.error:

2098

pass

2104

pass

2099

if port != 80:

2105

if port != 80:

2100

ui.status(_('listening at http://%s:%d/\n') % (addr, port))

2106

ui.status(_('listening at http://%s:%d/\n') % (addr, port))

2101

else:

2107

else:

2102

ui.status(_('listening at http://%s/\n') % addr)

2108

ui.status(_('listening at http://%s/\n') % addr)

2103

2109

2104

if opts['pid_file']:

2110

if opts['pid_file']:

2105

fp = open(opts['pid_file'], 'w')

2111

fp = open(opts['pid_file'], 'w')

2106

fp.write(str(os.getpid()))

2112

fp.write(str(os.getpid()))

2107

fp.close()

2113

fp.close()

2108

2114

2109

if opts['daemon_pipefds']:

2115

if opts['daemon_pipefds']:

2110

rfd, wfd = [int(x) for x in opts['daemon_pipefds'].split(',')]

2116

rfd, wfd = [int(x) for x in opts['daemon_pipefds'].split(',')]

2111

os.close(rfd)

2117

os.close(rfd)

2112

os.write(wfd, 'y')

2118

os.write(wfd, 'y')

2113

os.close(wfd)

2119

os.close(wfd)

2114

sys.stdout.flush()

2120

sys.stdout.flush()

2115

sys.stderr.flush()

2121

sys.stderr.flush()

2116

fd = os.open(util.nulldev, os.O_RDWR)

2122

fd = os.open(util.nulldev, os.O_RDWR)

2117

if fd != 0: os.dup2(fd, 0)

2123

if fd != 0: os.dup2(fd, 0)

2118

if fd != 1: os.dup2(fd, 1)

2124

if fd != 1: os.dup2(fd, 1)

2119

if fd != 2: os.dup2(fd, 2)

2125

if fd != 2: os.dup2(fd, 2)

2120

if fd not in (0, 1, 2): os.close(fd)

2126

if fd not in (0, 1, 2): os.close(fd)

2121

2127

2122

httpd.serve_forever()

2128

httpd.serve_forever()

2123

2129

2124

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

2130

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

2125

"""show changed files in the working directory

2131

"""show changed files in the working directory

2126

2132

2127

Show changed files in the repository. If names are

2133

Show changed files in the repository. If names are

2128

given, only files that match are shown.

2134

given, only files that match are shown.

2129

2135

2130

The codes used to show the status of files are:

2136

The codes used to show the status of files are:

2131

M = modified

2137

M = modified

2132

A = added

2138

A = added

2133

R = removed

2139

R = removed

2134

! = deleted, but still tracked

2140

! = deleted, but still tracked

2135

? = not tracked

2141

? = not tracked

2136

"""

2142

"""

2137

2143

2138

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

2144

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

2139

cwd = (pats and repo.getcwd()) or ''

2145

cwd = (pats and repo.getcwd()) or ''

2140

modified, added, removed, deleted, unknown = [

2146

modified, added, removed, deleted, unknown = [

2141

[util.pathto(cwd, x) for x in n]

2147

[util.pathto(cwd, x) for x in n]

2142

for n in repo.changes(files=files, match=matchfn)]

2148

for n in repo.changes(files=files, match=matchfn)]

2143

2149

2144

changetypes = [(_('modified'), 'M', modified),

2150

changetypes = [(_('modified'), 'M', modified),

2145

(_('added'), 'A', added),

2151

(_('added'), 'A', added),

2146

(_('removed'), 'R', removed),

2152

(_('removed'), 'R', removed),

2147

(_('deleted'), '!', deleted),

2153

(_('deleted'), '!', deleted),

2148

(_('unknown'), '?', unknown)]

2154

(_('unknown'), '?', unknown)]

2149

2155

2150

end = opts['print0'] and '\0' or '\n'

2156

end = opts['print0'] and '\0' or '\n'

2151

2157

2152

for opt, char, changes in ([ct for ct in changetypes if opts[ct[0]]]

2158

for opt, char, changes in ([ct for ct in changetypes if opts[ct[0]]]

2153

or changetypes):

2159

or changetypes):

2154

if opts['no_status']:

2160

if opts['no_status']:

2155

format = "%%s%s" % end

2161

format = "%%s%s" % end

2156

else:

2162

else:

2157

format = "%s %%s%s" % (char, end);

2163

format = "%s %%s%s" % (char, end);

2158

2164

2159

for f in changes:

2165

for f in changes:

2160

ui.write(format % f)

2166

ui.write(format % f)

2161

2167

2162

def tag(ui, repo, name, rev_=None, **opts):

2168

def tag(ui, repo, name, rev_=None, **opts):

2163

"""add a tag for the current tip or a given revision

2169

"""add a tag for the current tip or a given revision

2164

2170

2165

Name a particular revision using <name>.

2171

Name a particular revision using <name>.

2166

2172

2167

Tags are used to name particular revisions of the repository and are

2173

Tags are used to name particular revisions of the repository and are

2168

very useful to compare different revision, to go back to significant

2174

very useful to compare different revision, to go back to significant

2169

earlier versions or to mark branch points as releases, etc.

2175

earlier versions or to mark branch points as releases, etc.

2170

2176

2171

If no revision is given, the tip is used.

2177

If no revision is given, the tip is used.

2172

2178

2173

To facilitate version control, distribution, and merging of tags,

2179

To facilitate version control, distribution, and merging of tags,

2174

they are stored as a file named ".hgtags" which is managed

2180

they are stored as a file named ".hgtags" which is managed

2175

similarly to other project files and can be hand-edited if

2181

similarly to other project files and can be hand-edited if

2176

necessary. The file '.hg/localtags' is used for local tags (not

2182

necessary. The file '.hg/localtags' is used for local tags (not

2177

shared among repositories).

2183

shared among repositories).

2178

"""

2184

"""

2179

if name == "tip":

2185

if name == "tip":

2180

raise util.Abort(_("the name 'tip' is reserved"))

2186

raise util.Abort(_("the name 'tip' is reserved"))

2181

if rev_ is not None:

2187

if rev_ is not None:

2182

ui.warn(_("use of 'hg tag NAME [REV]' is deprecated, "

2188

ui.warn(_("use of 'hg tag NAME [REV]' is deprecated, "

2183

"please use 'hg tag [-r REV] NAME' instead\n"))

2189

"please use 'hg tag [-r REV] NAME' instead\n"))

2184

if opts['rev']:

2190

if opts['rev']:

2185

raise util.Abort(_("use only one form to specify the revision"))

2191

raise util.Abort(_("use only one form to specify the revision"))

2186

if opts['rev']:

2192

if opts['rev']:

2187

rev_ = opts['rev']

2193

rev_ = opts['rev']

2188

if rev_:

2194

if rev_:

2189

r = hex(repo.lookup(rev_))

2195

r = hex(repo.lookup(rev_))

2190

else:

2196

else:

2191

r = hex(repo.changelog.tip())

2197

r = hex(repo.changelog.tip())

2192

2198

2193

disallowed = (revrangesep, '\r', '\n')

2199

disallowed = (revrangesep, '\r', '\n')

2194

for c in disallowed:

2200

for c in disallowed:

2195

if name.find(c) >= 0:

2201

if name.find(c) >= 0:

2196

raise util.Abort(_("%s cannot be used in a tag name") % repr(c))

2202

raise util.Abort(_("%s cannot be used in a tag name") % repr(c))

2197

2203

2198

repo.hook('pretag', throw=True, node=r, tag=name,

2204

repo.hook('pretag', throw=True, node=r, tag=name,

2199

local=int(not not opts['local']))

2205

local=int(not not opts['local']))

2200

2206

2201

if opts['local']:

2207

if opts['local']:

2202

repo.opener("localtags", "a").write("%s %s\n" % (r, name))

2208

repo.opener("localtags", "a").write("%s %s\n" % (r, name))

2203

repo.hook('tag', node=r, tag=name, local=1)

2209

repo.hook('tag', node=r, tag=name, local=1)

2204

return

2210

return

2205

2211

2206

for x in repo.changes():

2212

for x in repo.changes():

2207

if ".hgtags" in x:

2213

if ".hgtags" in x:

2208

raise util.Abort(_("working copy of .hgtags is changed "

2214

raise util.Abort(_("working copy of .hgtags is changed "

2209

"(please commit .hgtags manually)"))

2215

"(please commit .hgtags manually)"))

2210

2216

2211

repo.wfile(".hgtags", "ab").write("%s %s\n" % (r, name))

2217

repo.wfile(".hgtags", "ab").write("%s %s\n" % (r, name))

2212

if repo.dirstate.state(".hgtags") == '?':

2218

if repo.dirstate.state(".hgtags") == '?':

2213

repo.add([".hgtags"])

2219

repo.add([".hgtags"])

2214

2220

2215

message = (opts['message'] or

2221

message = (opts['message'] or

2216

_("Added tag %s for changeset %s") % (name, r))

2222

_("Added tag %s for changeset %s") % (name, r))

2217

try:

2223

try:

2218

repo.commit([".hgtags"], message, opts['user'], opts['date'])

2224

repo.commit([".hgtags"], message, opts['user'], opts['date'])

2219

repo.hook('tag', node=r, tag=name, local=0)

2225

repo.hook('tag', node=r, tag=name, local=0)

2220

except ValueError, inst:

2226

except ValueError, inst:

2221

raise util.Abort(str(inst))

2227

raise util.Abort(str(inst))

2222

2228

2223

def tags(ui, repo):

2229

def tags(ui, repo):

2224

"""list repository tags

2230

"""list repository tags

2225

2231

2226

List the repository tags.

2232

List the repository tags.

2227

2233

2228

This lists both regular and local tags.

2234

This lists both regular and local tags.

2229

"""

2235

"""

2230

2236

2231

l = repo.tagslist()

2237

l = repo.tagslist()

2232

l.reverse()

2238

l.reverse()

2233

for t, n in l:

2239

for t, n in l:

2234

try:

2240

try:

2235

r = "%5d:%s" % (repo.changelog.rev(n), hex(n))

2241

r = "%5d:%s" % (repo.changelog.rev(n), hex(n))

2236

except KeyError:

2242

except KeyError:

2237

r = " ?:?"

2243

r = " ?:?"

2238

ui.write("%-30s %s\n" % (t, r))

2244

ui.write("%-30s %s\n" % (t, r))

2239

2245

2240

def tip(ui, repo, **opts):

2246

def tip(ui, repo, **opts):

2241

"""show the tip revision

2247

"""show the tip revision

2242

2248

2243

Show the tip revision.

2249

Show the tip revision.

2244

"""

2250

"""

2245

n = repo.changelog.tip()

2251

n = repo.changelog.tip()

2246

br = None

2252

br = None

2247

if opts['branches']:

2253

if opts['branches']:

2248

br = repo.branchlookup([n])

2254

br = repo.branchlookup([n])

2249

show_changeset(ui, repo, changenode=n, brinfo=br)

2255

show_changeset(ui, repo, changenode=n, brinfo=br)

2250

if opts['patch']:

2256

if opts['patch']:

2251

dodiff(ui, ui, repo, repo.changelog.parents(n)[0], n)

2257

dodiff(ui, ui, repo, repo.changelog.parents(n)[0], n)

2252

2258

2253

def unbundle(ui, repo, fname, **opts):

2259

def unbundle(ui, repo, fname, **opts):

2254

"""apply a changegroup file

2260

"""apply a changegroup file

2255

2261

2256

Apply a compressed changegroup file generated by the bundle

2262

Apply a compressed changegroup file generated by the bundle

2257

command.

2263

command.

2258

"""

2264

"""

2259

f = urllib.urlopen(fname)

2265

f = urllib.urlopen(fname)

2260

2266

2261

if f.read(4) != "HG10":

2267

if f.read(4) != "HG10":

2262

raise util.Abort(_("%s: not a Mercurial bundle file") % fname)

2268

raise util.Abort(_("%s: not a Mercurial bundle file") % fname)

2263

2269

2264

def bzgenerator(f):

2270

def bzgenerator(f):

2265

zd = bz2.BZ2Decompressor()

2271

zd = bz2.BZ2Decompressor()

2266

for chunk in f:

2272

for chunk in f:

2267

yield zd.decompress(chunk)

2273

yield zd.decompress(chunk)

2268

2274

2269

bzgen = bzgenerator(util.filechunkiter(f, 4096))

2275

bzgen = bzgenerator(util.filechunkiter(f, 4096))

2270

if repo.addchangegroup(util.chunkbuffer(bzgen)):

2276

if repo.addchangegroup(util.chunkbuffer(bzgen)):

2271

return 1

2277

return 1

2272

2278

2273

if opts['update']:

2279

if opts['update']:

2274

return update(ui, repo)

2280

return update(ui, repo)

2275

else:

2281

else:

2276

ui.status(_("(run 'hg update' to get a working copy)\n"))

2282

ui.status(_("(run 'hg update' to get a working copy)\n"))

2277

2283

2278

def undo(ui, repo):

2284

def undo(ui, repo):

2279

"""undo the last commit or pull

2285

"""undo the last commit or pull

2280

2286

2281

Roll back the last pull or commit transaction on the

2287

Roll back the last pull or commit transaction on the

2282

repository, restoring the project to its earlier state.

2288

repository, restoring the project to its earlier state.

2283

2289

2284

This command should be used with care. There is only one level of

2290

This command should be used with care. There is only one level of

2285

undo and there is no redo.

2291

undo and there is no redo.

2286

2292

2287

This command is not intended for use on public repositories. Once

2293

This command is not intended for use on public repositories. Once

2288

a change is visible for pull by other users, undoing it locally is

2294

a change is visible for pull by other users, undoing it locally is

2289

ineffective.

2295

ineffective.

2290

"""

2296

"""

2291

repo.undo()

2297

repo.undo()

2292

2298

2293

def update(ui, repo, node=None, merge=False, clean=False, force=None,

2299

def update(ui, repo, node=None, merge=False, clean=False, force=None,

2294

branch=None):

2300

branch=None):

2295

"""update or merge working directory

2301

"""update or merge working directory

2296

2302

2297

Update the working directory to the specified revision.

2303

Update the working directory to the specified revision.

2298

2304

2299

If there are no outstanding changes in the working directory and

2305

If there are no outstanding changes in the working directory and

2300

there is a linear relationship between the current version and the

2306

there is a linear relationship between the current version and the

2301

requested version, the result is the requested version.

2307

requested version, the result is the requested version.

2302

2308

2303

Otherwise the result is a merge between the contents of the

2309

Otherwise the result is a merge between the contents of the

2304

current working directory and the requested version. Files that

2310

current working directory and the requested version. Files that

2305

changed between either parent are marked as changed for the next

2311

changed between either parent are marked as changed for the next

2306

commit and a commit must be performed before any further updates

2312

commit and a commit must be performed before any further updates

2307

are allowed.

2313

are allowed.

2308

2314

2309

By default, update will refuse to run if doing so would require

2315

By default, update will refuse to run if doing so would require

2310

merging or discarding local changes.

2316

merging or discarding local changes.

2311

"""

2317

"""

2312

if branch:

2318

if branch:

2313

br = repo.branchlookup(branch=branch)

2319

br = repo.branchlookup(branch=branch)

2314

found = []

2320

found = []

2315

for x in br:

2321

for x in br:

2316

if branch in br[x]:

2322

if branch in br[x]:

2317

found.append(x)

2323

found.append(x)

2318

if len(found) > 1:

2324

if len(found) > 1:

2319

ui.warn(_("Found multiple heads for %s\n") % branch)

2325

ui.warn(_("Found multiple heads for %s\n") % branch)

2320

for x in found:

2326

for x in found:

2321

show_changeset(ui, repo, changenode=x, brinfo=br)

2327

show_changeset(ui, repo, changenode=x, brinfo=br)

2322

return 1

2328

return 1

2323

if len(found) == 1:

2329

if len(found) == 1:

2324

node = found[0]

2330

node = found[0]

2325

ui.warn(_("Using head %s for branch %s\n") % (short(node), branch))

2331

ui.warn(_("Using head %s for branch %s\n") % (short(node), branch))

2326

else:

2332

else:

2327

ui.warn(_("branch %s not found\n") % (branch))

2333

ui.warn(_("branch %s not found\n") % (branch))

2328

return 1

2334

return 1

2329

else:

2335

else:

2330

node = node and repo.lookup(node) or repo.changelog.tip()

2336

node = node and repo.lookup(node) or repo.changelog.tip()

2331

return repo.update(node, allow=merge, force=clean, forcemerge=force)

2337

return repo.update(node, allow=merge, force=clean, forcemerge=force)

2332

2338

2333

def verify(ui, repo):

2339

def verify(ui, repo):

2334

"""verify the integrity of the repository

2340

"""verify the integrity of the repository

2335

2341

2336

Verify the integrity of the current repository.

2342

Verify the integrity of the current repository.

2337

2343

2338

This will perform an extensive check of the repository's

2344

This will perform an extensive check of the repository's

2339

integrity, validating the hashes and checksums of each entry in

2345

integrity, validating the hashes and checksums of each entry in

2340

the changelog, manifest, and tracked files, as well as the

2346

the changelog, manifest, and tracked files, as well as the

2341

integrity of their crosslinks and indices.

2347

integrity of their crosslinks and indices.

2342

"""

2348

"""

2343

return repo.verify()

2349

return repo.verify()

2344

2350

2345

# Command options and aliases are listed here, alphabetically

2351

# Command options and aliases are listed here, alphabetically

2346

2352

2347

table = {

2353

table = {

2348

"^add":

2354

"^add":

2349

(add,

2355

(add,

2350

[('I', 'include', [], _('include names matching the given patterns')),

2356

[('I', 'include', [], _('include names matching the given patterns')),

2351

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2357

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2352

_('hg add [OPTION]... [FILE]...')),

2358

_('hg add [OPTION]... [FILE]...')),

2353

"addremove":

2359

"addremove":

2354

(addremove,

2360

(addremove,

2355

[('I', 'include', [], _('include names matching the given patterns')),

2361

[('I', 'include', [], _('include names matching the given patterns')),

2356

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2362

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2357

_('hg addremove [OPTION]... [FILE]...')),

2363

_('hg addremove [OPTION]... [FILE]...')),

2358

"^annotate":

2364

"^annotate":

2359

(annotate,

2365

(annotate,

2360

[('r', 'rev', '', _('annotate the specified revision')),

2366

[('r', 'rev', '', _('annotate the specified revision')),

2361

('a', 'text', None, _('treat all files as text')),

2367

('a', 'text', None, _('treat all files as text')),

2362

('u', 'user', None, _('list the author')),

2368

('u', 'user', None, _('list the author')),

2363

('d', 'date', None, _('list the date')),

2369

('d', 'date', None, _('list the date')),

2364

('n', 'number', None, _('list the revision number (default)')),

2370

('n', 'number', None, _('list the revision number (default)')),

2365

('c', 'changeset', None, _('list the changeset')),

2371

('c', 'changeset', None, _('list the changeset')),

2366

('I', 'include', [], _('include names matching the given patterns')),

2372

('I', 'include', [], _('include names matching the given patterns')),

2367

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2373

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2368

_('hg annotate [OPTION]... FILE...')),

2374

_('hg annotate [OPTION]... FILE...')),

2369

"bundle":

2375

"bundle":

2370

(bundle,

2376

(bundle,

2371

[],

2377

[],

2372

_('hg bundle FILE DEST')),

2378

_('hg bundle FILE DEST')),

2373

"cat":

2379

"cat":

2374

(cat,

2380

(cat,

2375

[('I', 'include', [], _('include names matching the given patterns')),

2381

[('I', 'include', [], _('include names matching the given patterns')),

2376

('X', 'exclude', [], _('exclude names matching the given patterns')),

2382

('X', 'exclude', [], _('exclude names matching the given patterns')),

2377

('o', 'output', '', _('print output to file with formatted name')),

2383

('o', 'output', '', _('print output to file with formatted name')),

2378

('r', 'rev', '', _('print the given revision'))],

2384

('r', 'rev', '', _('print the given revision'))],

2379

_('hg cat [OPTION]... FILE...')),

2385

_('hg cat [OPTION]... FILE...')),

2380

"^clone":

2386

"^clone":

2381

(clone,

2387

(clone,

2382

[('U', 'noupdate', None, _('do not update the new working directory')),

2388

[('U', 'noupdate', None, _('do not update the new working directory')),

2383

('e', 'ssh', '', _('specify ssh command to use')),

2389

('e', 'ssh', '', _('specify ssh command to use')),

2384

('', 'pull', None, _('use pull protocol to copy metadata')),

2390

('', 'pull', None, _('use pull protocol to copy metadata')),

2385

('r', 'rev', [],

2391

('r', 'rev', [],

2386

_('a changeset you would like to have after cloning')),

2392

_('a changeset you would like to have after cloning')),

2387

('', 'remotecmd', '',

2393

('', 'remotecmd', '',

2388

_('specify hg command to run on the remote side'))],

2394

_('specify hg command to run on the remote side'))],

2389

_('hg clone [OPTION]... SOURCE [DEST]')),

2395

_('hg clone [OPTION]... SOURCE [DEST]')),

2390

"^commit|ci":

2396

"^commit|ci":

2391

(commit,

2397

(commit,

2392

[('A', 'addremove', None, _('run addremove during commit')),

2398

[('A', 'addremove', None, _('run addremove during commit')),

2393

('I', 'include', [], _('include names matching the given patterns')),

2399

('I', 'include', [], _('include names matching the given patterns')),

2394

('X', 'exclude', [], _('exclude names matching the given patterns')),

2400

('X', 'exclude', [], _('exclude names matching the given patterns')),

2395

('m', 'message', '', _('use <text> as commit message')),

2401

('m', 'message', '', _('use <text> as commit message')),

2396

('l', 'logfile', '', _('read the commit message from <file>')),

2402

('l', 'logfile', '', _('read the commit message from <file>')),

2397

('d', 'date', '', _('record datecode as commit date')),

2403

('d', 'date', '', _('record datecode as commit date')),

2398

('u', 'user', '', _('record user as commiter'))],

2404

('u', 'user', '', _('record user as commiter'))],

2399

_('hg commit [OPTION]... [FILE]...')),

2405

_('hg commit [OPTION]... [FILE]...')),

2400

"copy|cp":

2406

"copy|cp":

2401

(copy,

2407

(copy,

2402

[('I', 'include', [], _('include names matching the given patterns')),

2408

[('I', 'include', [], _('include names matching the given patterns')),

2403

('X', 'exclude', [], _('exclude names matching the given patterns')),

2409

('X', 'exclude', [], _('exclude names matching the given patterns')),

2404

('A', 'after', None, _('record a copy that has already occurred')),

2410

('A', 'after', None, _('record a copy that has already occurred')),

2405

('f', 'force', None,

2411

('f', 'force', None,

2406

_('forcibly copy over an existing managed file'))],

2412

_('forcibly copy over an existing managed file'))],

2407

_('hg copy [OPTION]... [SOURCE]... DEST')),

2413

_('hg copy [OPTION]... [SOURCE]... DEST')),

2408

"debugancestor": (debugancestor, [], _('debugancestor INDEX REV1 REV2')),

2414

"debugancestor": (debugancestor, [], _('debugancestor INDEX REV1 REV2')),

2409

"debugrebuildstate":

2415

"debugrebuildstate":

2410

(debugrebuildstate,

2416

(debugrebuildstate,

2411

[('r', 'rev', "", _("revision to rebuild to"))],

2417

[('r', 'rev', "", _("revision to rebuild to"))],

2412

_('debugrebuildstate [-r REV] [REV]')),

2418

_('debugrebuildstate [-r REV] [REV]')),

2413

"debugcheckstate": (debugcheckstate, [], _('debugcheckstate')),

2419

"debugcheckstate": (debugcheckstate, [], _('debugcheckstate')),

2414

"debugconfig": (debugconfig, [], _('debugconfig')),

2420

"debugconfig": (debugconfig, [], _('debugconfig')),

2415

"debugsetparents": (debugsetparents, [], _('debugsetparents REV1 [REV2]')),

2421

"debugsetparents": (debugsetparents, [], _('debugsetparents REV1 [REV2]')),

2416

"debugstate": (debugstate, [], _('debugstate')),

2422

"debugstate": (debugstate, [], _('debugstate')),

2417

"debugdata": (debugdata, [], _('debugdata FILE REV')),

2423

"debugdata": (debugdata, [], _('debugdata FILE REV')),

2418

"debugindex": (debugindex, [], _('debugindex FILE')),

2424

"debugindex": (debugindex, [], _('debugindex FILE')),

2419

"debugindexdot": (debugindexdot, [], _('debugindexdot FILE')),

2425

"debugindexdot": (debugindexdot, [], _('debugindexdot FILE')),

2420

"debugrename": (debugrename, [], _('debugrename FILE [REV]')),

2426

"debugrename": (debugrename, [], _('debugrename FILE [REV]')),

2421

"debugwalk":

2427

"debugwalk":

2422

(debugwalk,

2428

(debugwalk,

2423

[('I', 'include', [], _('include names matching the given patterns')),

2429

[('I', 'include', [], _('include names matching the given patterns')),

2424

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2430

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2425

_('debugwalk [OPTION]... [FILE]...')),

2431

_('debugwalk [OPTION]... [FILE]...')),

2426

"^diff":

2432

"^diff":

2427

(diff,

2433

(diff,

2428

[('r', 'rev', [], _('revision')),

2434

[('r', 'rev', [], _('revision')),

2429

('a', 'text', None, _('treat all files as text')),

2435

('a', 'text', None, _('treat all files as text')),

2430

('I', 'include', [], _('include names matching the given patterns')),

2436

('I', 'include', [], _('include names matching the given patterns')),

2431

('p', 'show-function', None,

2437

('p', 'show-function', None,

2432

_('show which function each change is in')),

2438

_('show which function each change is in')),

2433

('w', 'ignore-all-space', None,

2439

('w', 'ignore-all-space', None,

2434

_('ignore white space when comparing lines')),

2440

_('ignore white space when comparing lines')),

2435

('X', 'exclude', [],

2441

('X', 'exclude', [],

2436

_('exclude names matching the given patterns'))],

2442

_('exclude names matching the given patterns'))],

2437

_('hg diff [-a] [-I] [-X] [-r REV1 [-r REV2]] [FILE]...')),

2443

_('hg diff [-a] [-I] [-X] [-r REV1 [-r REV2]] [FILE]...')),

2438

"^export":

2444

"^export":

2439

(export,

2445

(export,

2440

[('o', 'output', '', _('print output to file with formatted name')),

2446

[('o', 'output', '', _('print output to file with formatted name')),

2441

('a', 'text', None, _('treat all files as text')),

2447

('a', 'text', None, _('treat all files as text')),

2442

('', 'switch-parent', None, _('diff against the second parent'))],

2448

('', 'switch-parent', None, _('diff against the second parent'))],

2443

_('hg export [-a] [-o OUTFILE] REV...')),

2449

_('hg export [-a] [-o OUTFILE] REV...')),

2444

"forget":

2450

"forget":

2445

(forget,

2451

(forget,

2446

[('I', 'include', [], _('include names matching the given patterns')),

2452

[('I', 'include', [], _('include names matching the given patterns')),

2447

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2453

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2448

_('hg forget [OPTION]... FILE...')),

2454

_('hg forget [OPTION]... FILE...')),

2449

"grep":

2455

"grep":

2450

(grep,

2456

(grep,

2451

[('0', 'print0', None, _('end fields with NUL')),

2457

[('0', 'print0', None, _('end fields with NUL')),

2452

('I', 'include', [], _('include names matching the given patterns')),

2458

('I', 'include', [], _('include names matching the given patterns')),

2453

('X', 'exclude', [], _('exclude names matching the given patterns')),

2459

('X', 'exclude', [], _('exclude names matching the given patterns')),

2454

('', 'all', None, _('print all revisions that match')),

2460

('', 'all', None, _('print all revisions that match')),

2455

('i', 'ignore-case', None, _('ignore case when matching')),

2461

('i', 'ignore-case', None, _('ignore case when matching')),

2456

('l', 'files-with-matches', None,

2462

('l', 'files-with-matches', None,

2457

_('print only filenames and revs that match')),

2463

_('print only filenames and revs that match')),

2458

('n', 'line-number', None, _('print matching line numbers')),

2464

('n', 'line-number', None, _('print matching line numbers')),

2459

('r', 'rev', [], _('search in given revision range')),

2465

('r', 'rev', [], _('search in given revision range')),

2460

('u', 'user', None, _('print user who committed change'))],

2466

('u', 'user', None, _('print user who committed change'))],

2461

_('hg grep [OPTION]... PATTERN [FILE]...')),

2467

_('hg grep [OPTION]... PATTERN [FILE]...')),

2462

"heads":

2468

"heads":

2463

(heads,

2469

(heads,

2464

[('b', 'branches', None, _('show branches')),

2470

[('b', 'branches', None, _('show branches')),

2465

('r', 'rev', '', _('show only heads which are descendants of rev'))],

2471

('r', 'rev', '', _('show only heads which are descendants of rev'))],

2466

_('hg heads [-b] [-r <rev>]')),

2472

_('hg heads [-b] [-r <rev>]')),

2467

"help": (help_, [], _('hg help [COMMAND]')),

2473

"help": (help_, [], _('hg help [COMMAND]')),

2468

"identify|id": (identify, [], _('hg identify')),

2474

"identify|id": (identify, [], _('hg identify')),

2469

"import|patch":

2475

"import|patch":

2470

(import_,

2476

(import_,

2471

[('p', 'strip', 1,

2477

[('p', 'strip', 1,

2472

_('directory strip option for patch. This has the same\n') +

2478

_('directory strip option for patch. This has the same\n') +

2473

_('meaning as the corresponding patch option')),

2479

_('meaning as the corresponding patch option')),

2474

('f', 'force', None,

2480

('f', 'force', None,

2475

_('skip check for outstanding uncommitted changes')),

2481

_('skip check for outstanding uncommitted changes')),

2476

('b', 'base', '', _('base path'))],

2482

('b', 'base', '', _('base path'))],

2477

_('hg import [-f] [-p NUM] [-b BASE] PATCH...')),

2483

_('hg import [-f] [-p NUM] [-b BASE] PATCH...')),

2478

"incoming|in": (incoming,

2484

"incoming|in": (incoming,

2479

[('M', 'no-merges', None, _('do not show merges')),

2485

[('M', 'no-merges', None, _('do not show merges')),

2480

('p', 'patch', None, _('show patch')),

2486

('p', 'patch', None, _('show patch')),

2481

('n', 'newest-first', None, _('show newest record first'))],

2487

('n', 'newest-first', None, _('show newest record first'))],

2482

_('hg incoming [-p] [-n] [-M] [SOURCE]')),

2488

_('hg incoming [-p] [-n] [-M] [SOURCE]')),

2483

"^init": (init, [], _('hg init [DEST]')),

2489

"^init": (init, [], _('hg init [DEST]')),

2484

"locate":

2490

"locate":

2485

(locate,

2491

(locate,

2486

[('r', 'rev', '', _('search the repository as it stood at rev')),

2492

[('r', 'rev', '', _('search the repository as it stood at rev')),

2487

('0', 'print0', None,

2493

('0', 'print0', None,

2488

_('end filenames with NUL, for use with xargs')),

2494

_('end filenames with NUL, for use with xargs')),

2489

('f', 'fullpath', None,

2495

('f', 'fullpath', None,

2490

_('print complete paths from the filesystem root')),

2496

_('print complete paths from the filesystem root')),

2491

('I', 'include', [], _('include names matching the given patterns')),

2497

('I', 'include', [], _('include names matching the given patterns')),

2492

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2498

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2493

_('hg locate [OPTION]... [PATTERN]...')),

2499

_('hg locate [OPTION]... [PATTERN]...')),

2494

"^log|history":

2500

"^log|history":

2495

(log,

2501

(log,

2496

[('I', 'include', [], _('include names matching the given patterns')),

2502

[('I', 'include', [], _('include names matching the given patterns')),

2497

('X', 'exclude', [], _('exclude names matching the given patterns')),

2503

('X', 'exclude', [], _('exclude names matching the given patterns')),

2498

('b', 'branches', None, _('show branches')),

2504

('b', 'branches', None, _('show branches')),

2499

('k', 'keyword', [], _('search for a keyword')),

2505

('k', 'keyword', [], _('search for a keyword')),

2500

('l', 'limit', '', _('limit number of changes displayed')),

2506

('l', 'limit', '', _('limit number of changes displayed')),

2501

('r', 'rev', [], _('show the specified revision or range')),

2507

('r', 'rev', [], _('show the specified revision or range')),

2502

('M', 'no-merges', None, _('do not show merges')),

2508

('M', 'no-merges', None, _('do not show merges')),

2503

('m', 'only-merges', None, _('show only merges')),

2509

('m', 'only-merges', None, _('show only merges')),

2504

('p', 'patch', None, _('show patch'))],

2510

('p', 'patch', None, _('show patch'))],

2505

_('hg log [-I] [-X] [-r REV]... [-p] [FILE]')),

2511

_('hg log [-I] [-X] [-r REV]... [-p] [FILE]')),

2506

"manifest": (manifest, [], _('hg manifest [REV]')),

2512

"manifest": (manifest, [], _('hg manifest [REV]')),

2507

"outgoing|out": (outgoing,

2513

"outgoing|out": (outgoing,

2508

[('M', 'no-merges', None, _('do not show merges')),

2514

[('M', 'no-merges', None, _('do not show merges')),

2509

('p', 'patch', None, _('show patch')),

2515

('p', 'patch', None, _('show patch')),

2510

('n', 'newest-first', None, _('show newest record first'))],

2516

('n', 'newest-first', None, _('show newest record first'))],

2511

_('hg outgoing [-p] [-n] [-M] [DEST]')),

2517

_('hg outgoing [-p] [-n] [-M] [DEST]')),

2512

"^parents":

2518

"^parents":

2513

(parents,

2519

(parents,

2514

[('b', 'branches', None, _('show branches'))],

2520

[('b', 'branches', None, _('show branches'))],

2515

_('hg parents [-b] [REV]')),

2521

_('hg parents [-b] [REV]')),

2516

"paths": (paths, [], _('hg paths [NAME]')),

2522

"paths": (paths, [], _('hg paths [NAME]')),

2517

"^pull":

2523

"^pull":

2518

(pull,

2524

(pull,

2519

[('u', 'update', None,

2525

[('u', 'update', None,

2520

_('update the working directory to tip after pull')),

2526

_('update the working directory to tip after pull')),

2521

('e', 'ssh', '', _('specify ssh command to use')),

2527

('e', 'ssh', '', _('specify ssh command to use')),

2522

('r', 'rev', [], _('a specific revision you would like to pull')),

2528

('r', 'rev', [], _('a specific revision you would like to pull')),

2523

('', 'remotecmd', '',

2529

('', 'remotecmd', '',

2524

_('specify hg command to run on the remote side'))],

2530

_('specify hg command to run on the remote side'))],

2525

_('hg pull [-u] [-e FILE] [-r rev]... [--remotecmd FILE] [SOURCE]')),

2531

_('hg pull [-u] [-e FILE] [-r rev]... [--remotecmd FILE] [SOURCE]')),

2526

"^push":

2532

"^push":

2527

(push,

2533

(push,

2528

[('f', 'force', None, _('force push')),

2534

[('f', 'force', None, _('force push')),

2529

('e', 'ssh', '', _('specify ssh command to use')),

2535

('e', 'ssh', '', _('specify ssh command to use')),

2530

('r', 'rev', [], _('a specific revision you would like to push')),

2536

('r', 'rev', [], _('a specific revision you would like to push')),

2531

('', 'remotecmd', '',

2537

('', 'remotecmd', '',

2532

_('specify hg command to run on the remote side'))],

2538

_('specify hg command to run on the remote side'))],

2533

_('hg push [-f] [-e FILE] [-r rev]... [--remotecmd FILE] [DEST]')),

2539

_('hg push [-f] [-e FILE] [-r rev]... [--remotecmd FILE] [DEST]')),

2534

"rawcommit":

2540

"rawcommit":

2535

(rawcommit,

2541

(rawcommit,

2536

[('p', 'parent', [], _('parent')),

2542

[('p', 'parent', [], _('parent')),

2537

('d', 'date', '', _('date code')),

2543

('d', 'date', '', _('date code')),

2538

('u', 'user', '', _('user')),

2544

('u', 'user', '', _('user')),

2539

('F', 'files', '', _('file list')),

2545

('F', 'files', '', _('file list')),

2540

('m', 'message', '', _('commit message')),

2546

('m', 'message', '', _('commit message')),

2541

('l', 'logfile', '', _('commit message file'))],

2547

('l', 'logfile', '', _('commit message file'))],

2542

_('hg rawcommit [OPTION]... [FILE]...')),

2548

_('hg rawcommit [OPTION]... [FILE]...')),

2543

"recover": (recover, [], _('hg recover')),

2549

"recover": (recover, [], _('hg recover')),

2544

"^remove|rm":

2550

"^remove|rm":

2545

(remove,

2551

(remove,

2546

[('I', 'include', [], _('include names matching the given patterns')),

2552

[('I', 'include', [], _('include names matching the given patterns')),

2547

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2553

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2548

_('hg remove [OPTION]... FILE...')),

2554

_('hg remove [OPTION]... FILE...')),

2549

"rename|mv":

2555

"rename|mv":

2550

(rename,

2556

(rename,

2551

[('I', 'include', [], _('include names matching the given patterns')),

2557

[('I', 'include', [], _('include names matching the given patterns')),

2552

('X', 'exclude', [], _('exclude names matching the given patterns')),

2558

('X', 'exclude', [], _('exclude names matching the given patterns')),

2553

('A', 'after', None, _('record a rename that has already occurred')),

2559

('A', 'after', None, _('record a rename that has already occurred')),

2554

('f', 'force', None,

2560

('f', 'force', None,

2555

_('forcibly copy over an existing managed file'))],

2561

_('forcibly copy over an existing managed file'))],

2556

_('hg rename [OPTION]... [SOURCE]... DEST')),

2562

_('hg rename [OPTION]... [SOURCE]... DEST')),

2557

"^revert":

2563

"^revert":

2558

(revert,

2564

(revert,

2559

[('I', 'include', [], _('include names matching the given patterns')),

2565

[('I', 'include', [], _('include names matching the given patterns')),

2560

('X', 'exclude', [], _('exclude names matching the given patterns')),

2566

('X', 'exclude', [], _('exclude names matching the given patterns')),

2561

('r', 'rev', '', _('revision to revert to'))],

2567

('r', 'rev', '', _('revision to revert to'))],

2562

_('hg revert [-n] [-r REV] [NAME]...')),

2568

_('hg revert [-n] [-r REV] [NAME]...')),

2563

"root": (root, [], _('hg root')),

2569

"root": (root, [], _('hg root')),

2564

"^serve":

2570

"^serve":

2565

(serve,

2571

(serve,

2566

[('A', 'accesslog', '', _('name of access log file to write to')),

2572

[('A', 'accesslog', '', _('name of access log file to write to')),

2567

('d', 'daemon', None, _('run server in background')),

2573

('d', 'daemon', None, _('run server in background')),

2568

('', 'daemon-pipefds', '', _('used internally by daemon mode')),

2574

('', 'daemon-pipefds', '', _('used internally by daemon mode')),

2569

('E', 'errorlog', '', _('name of error log file to write to')),

2575

('E', 'errorlog', '', _('name of error log file to write to')),

2570

('p', 'port', 0, _('port to use (default: 8000)')),

2576

('p', 'port', 0, _('port to use (default: 8000)')),

2571

('a', 'address', '', _('address to use')),

2577

('a', 'address', '', _('address to use')),

2572

('n', 'name', '',

2578

('n', 'name', '',

2573

_('name to show in web pages (default: working dir)')),

2579

_('name to show in web pages (default: working dir)')),

2574

('', 'pid-file', '', _('name of file to write process ID to')),

2580

('', 'pid-file', '', _('name of file to write process ID to')),

2575

('', 'stdio', None, _('for remote clients')),

2581

('', 'stdio', None, _('for remote clients')),

2576

('t', 'templates', '', _('web templates to use')),

2582

('t', 'templates', '', _('web templates to use')),

2577

('', 'style', '', _('template style to use')),

2583

('', 'style', '', _('template style to use')),

2578

('6', 'ipv6', None, _('use IPv6 in addition to IPv4'))],

2584

('6', 'ipv6', None, _('use IPv6 in addition to IPv4'))],

2579

_('hg serve [OPTION]...')),

2585

_('hg serve [OPTION]...')),

2580

"^status|st":

2586

"^status|st":

2581

(status,

2587

(status,

2582

[('m', 'modified', None, _('show only modified files')),

2588

[('m', 'modified', None, _('show only modified files')),

2583

('a', 'added', None, _('show only added files')),

2589

('a', 'added', None, _('show only added files')),

2584

('r', 'removed', None, _('show only removed files')),

2590

('r', 'removed', None, _('show only removed files')),

2585

('d', 'deleted', None, _('show only deleted (but tracked) files')),

2591

('d', 'deleted', None, _('show only deleted (but tracked) files')),

2586

('u', 'unknown', None, _('show only unknown (not tracked) files')),

2592

('u', 'unknown', None, _('show only unknown (not tracked) files')),

2587

('n', 'no-status', None, _('hide status prefix')),

2593

('n', 'no-status', None, _('hide status prefix')),

2588

('0', 'print0', None,

2594

('0', 'print0', None,

2589

_('end filenames with NUL, for use with xargs')),

2595

_('end filenames with NUL, for use with xargs')),

2590

('I', 'include', [], _('include names matching the given patterns')),

2596

('I', 'include', [], _('include names matching the given patterns')),

2591

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2597

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2592

_('hg status [OPTION]... [FILE]...')),

2598

_('hg status [OPTION]... [FILE]...')),

2593

"tag":

2599

"tag":

2594

(tag,

2600

(tag,

2595

[('l', 'local', None, _('make the tag local')),

2601

[('l', 'local', None, _('make the tag local')),

2596

('m', 'message', '', _('message for tag commit log entry')),

2602

('m', 'message', '', _('message for tag commit log entry')),

2597

('d', 'date', '', _('record datecode as commit date')),

2603

('d', 'date', '', _('record datecode as commit date')),

2598

('u', 'user', '', _('record user as commiter')),

2604

('u', 'user', '', _('record user as commiter')),

2599

('r', 'rev', '', _('revision to tag'))],

2605

('r', 'rev', '', _('revision to tag'))],

2600

_('hg tag [-r REV] [OPTION]... NAME')),

2606

_('hg tag [-r REV] [OPTION]... NAME')),

2601

"tags": (tags, [], _('hg tags')),

2607

"tags": (tags, [], _('hg tags')),

2602

"tip":

2608

"tip":

2603

(tip,

2609

(tip,

2604

[('b', 'branches', None, _('show branches')),

2610

[('b', 'branches', None, _('show branches')),

2605

('p', 'patch', None, _('show patch'))],

2611

('p', 'patch', None, _('show patch'))],

2606

_('hg [-b] [-p] tip')),

2612

_('hg [-b] [-p] tip')),

2607

"unbundle":

2613

"unbundle":

2608

(unbundle,

2614

(unbundle,

2609

[('u', 'update', None,

2615

[('u', 'update', None,

2610

_('update the working directory to tip after unbundle'))],

2616

_('update the working directory to tip after unbundle'))],

2611

_('hg unbundle [-u] FILE')),

2617

_('hg unbundle [-u] FILE')),

2612

"undo": (undo, [], _('hg undo')),

2618

"undo": (undo, [], _('hg undo')),

2613

"^update|up|checkout|co":

2619

"^update|up|checkout|co":

2614

(update,

2620

(update,

2615

[('b', 'branch', '', _('checkout the head of a specific branch')),

2621

[('b', 'branch', '', _('checkout the head of a specific branch')),

2616

('m', 'merge', None, _('allow merging of branches')),

2622

('m', 'merge', None, _('allow merging of branches')),

2617

('C', 'clean', None, _('overwrite locally modified files')),

2623

('C', 'clean', None, _('overwrite locally modified files')),

2618

('f', 'force', None, _('force a merge with outstanding changes'))],

2624

('f', 'force', None, _('force a merge with outstanding changes'))],

2619

_('hg update [-b TAG] [-m] [-C] [-f] [REV]')),

2625

_('hg update [-b TAG] [-m] [-C] [-f] [REV]')),

2620

"verify": (verify, [], _('hg verify')),

2626

"verify": (verify, [], _('hg verify')),

2621

"version": (show_version, [], _('hg version')),

2627

"version": (show_version, [], _('hg version')),

2622

}

2628

}

2623

2629

2624

globalopts = [

2630

globalopts = [

2625

('R', 'repository', '', _('repository root directory')),

2631

('R', 'repository', '', _('repository root directory')),

2626

('', 'cwd', '', _('change working directory')),

2632

('', 'cwd', '', _('change working directory')),

2627

('y', 'noninteractive', None,

2633

('y', 'noninteractive', None,

2628

_('do not prompt, assume \'yes\' for any required answers')),

2634

_('do not prompt, assume \'yes\' for any required answers')),

2629

('q', 'quiet', None, _('suppress output')),

2635

('q', 'quiet', None, _('suppress output')),

2630

('v', 'verbose', None, _('enable additional output')),

2636

('v', 'verbose', None, _('enable additional output')),

2631

('', 'debug', None, _('enable debugging output')),

2637

('', 'debug', None, _('enable debugging output')),

2632

('', 'debugger', None, _('start debugger')),

2638

('', 'debugger', None, _('start debugger')),

2633

('', 'traceback', None, _('print traceback on exception')),

2639

('', 'traceback', None, _('print traceback on exception')),

2634

('', 'time', None, _('time how long the command takes')),

2640

('', 'time', None, _('time how long the command takes')),

2635

('', 'profile', None, _('print command execution profile')),

2641

('', 'profile', None, _('print command execution profile')),

2636

('', 'version', None, _('output version information and exit')),

2642

('', 'version', None, _('output version information and exit')),

2637

('h', 'help', None, _('display help and exit')),

2643

('h', 'help', None, _('display help and exit')),

2638

]

2644

]

2639

2645

2640

norepo = ("clone init version help debugancestor debugconfig debugdata"

2646

norepo = ("clone init version help debugancestor debugconfig debugdata"

2641

" debugindex debugindexdot paths")

2647

" debugindex debugindexdot paths")

2642

2648

2643

def find(cmd):

2649

def find(cmd):

2644

"""Return (aliases, command table entry) for command string."""

2650

"""Return (aliases, command table entry) for command string."""

2645

choice = None

2651

choice = None

2646

count = 0

2652

count = 0

2647

for e in table.keys():

2653

for e in table.keys():

2648

aliases = e.lstrip("^").split("|")

2654

aliases = e.lstrip("^").split("|")

2649

if cmd in aliases:

2655

if cmd in aliases:

2650

return aliases, table[e]

2656

return aliases, table[e]

2651

for a in aliases:

2657

for a in aliases:

2652

if a.startswith(cmd):

2658

if a.startswith(cmd):

2653

count += 1

2659

count += 1

2654

choice = aliases, table[e]

2660

choice = aliases, table[e]

2655

break

2661

break

2656

2662

2657

if count > 1:

2663

if count > 1:

2658

raise AmbiguousCommand(cmd)

2664

raise AmbiguousCommand(cmd)

2659

2665

2660

if choice:

2666

if choice:

2661

return choice

2667

return choice

2662

2668

2663

raise UnknownCommand(cmd)

2669

raise UnknownCommand(cmd)

2664

2670

2665

class SignalInterrupt(Exception):

2671

class SignalInterrupt(Exception):

2666

"""Exception raised on SIGTERM and SIGHUP."""

2672

"""Exception raised on SIGTERM and SIGHUP."""

2667

2673

2668

def catchterm(*args):

2674

def catchterm(*args):

2669

raise SignalInterrupt

2675

raise SignalInterrupt

2670

2676

2671

def run():

2677

def run():

2672

sys.exit(dispatch(sys.argv[1:]))

2678

sys.exit(dispatch(sys.argv[1:]))

2673

2679

2674

class ParseError(Exception):

2680

class ParseError(Exception):

2675

"""Exception raised on errors in parsing the command line."""

2681

"""Exception raised on errors in parsing the command line."""

2676

2682

2677

def parse(ui, args):

2683

def parse(ui, args):

2678

options = {}

2684

options = {}

2679

cmdoptions = {}

2685

cmdoptions = {}

2680

2686

2681

try:

2687

try:

2682

args = fancyopts.fancyopts(args, globalopts, options)

2688

args = fancyopts.fancyopts(args, globalopts, options)

2683

except fancyopts.getopt.GetoptError, inst:

2689

except fancyopts.getopt.GetoptError, inst:

2684

raise ParseError(None, inst)

2690

raise ParseError(None, inst)

2685

2691

2686

if args:

2692

if args:

2687

cmd, args = args[0], args[1:]

2693

cmd, args = args[0], args[1:]

2688

aliases, i = find(cmd)

2694

aliases, i = find(cmd)

2689

cmd = aliases[0]

2695

cmd = aliases[0]

2690

defaults = ui.config("defaults", cmd)

2696

defaults = ui.config("defaults", cmd)

2691

if defaults:

2697

if defaults:

2692

args = defaults.split() + args

2698

args = defaults.split() + args

2693

c = list(i[1])

2699

c = list(i[1])

2694

else:

2700

else:

2695

cmd = None

2701

cmd = None

2696

c = []

2702

c = []

2697

2703

2698

# combine global options into local

2704

# combine global options into local

2699

for o in globalopts:

2705

for o in globalopts:

2700

c.append((o[0], o[1], options[o[1]], o[3]))

2706

c.append((o[0], o[1], options[o[1]], o[3]))

2701

2707

2702

try:

2708

try:

2703

args = fancyopts.fancyopts(args, c, cmdoptions)

2709

args = fancyopts.fancyopts(args, c, cmdoptions)

2704

except fancyopts.getopt.GetoptError, inst:

2710

except fancyopts.getopt.GetoptError, inst:

2705

raise ParseError(cmd, inst)

2711

raise ParseError(cmd, inst)

2706

2712

2707

# separate global options back out

2713

# separate global options back out

2708

for o in globalopts:

2714

for o in globalopts:

2709

n = o[1]

2715

n = o[1]

2710

options[n] = cmdoptions[n]

2716

options[n] = cmdoptions[n]

2711

del cmdoptions[n]

2717

del cmdoptions[n]

2712

2718

2713

return (cmd, cmd and i[0] or None, args, options, cmdoptions)

2719

return (cmd, cmd and i[0] or None, args, options, cmdoptions)

2714

2720

2715

def dispatch(args):

2721

def dispatch(args):

2716

signal.signal(signal.SIGTERM, catchterm)

2722

signal.signal(signal.SIGTERM, catchterm)

2717

try:

2723

try:

2718

signal.signal(signal.SIGHUP, catchterm)

2724

signal.signal(signal.SIGHUP, catchterm)

2719

except AttributeError:

2725

except AttributeError:

2720

pass

2726

pass

2721

2727

2722

try:

2728

try:

2723

u = ui.ui()

2729

u = ui.ui()

2724

except util.Abort, inst:

2730

except util.Abort, inst:

2725

sys.stderr.write(_("abort: %s\n") % inst)

2731

sys.stderr.write(_("abort: %s\n") % inst)

2726

sys.exit(1)

2732

sys.exit(1)

2727

2733

2728

external = []

2734

external = []

2729

for x in u.extensions():

2735

for x in u.extensions():

2730

def on_exception(exc, inst):

2736

def on_exception(exc, inst):

2731

u.warn(_("*** failed to import extension %s\n") % x[1])

2737

u.warn(_("*** failed to import extension %s\n") % x[1])

2732

u.warn("%s\n" % inst)

2738

u.warn("%s\n" % inst)

2733

if "--traceback" in sys.argv[1:]:

2739

if "--traceback" in sys.argv[1:]:

2734

traceback.print_exc()

2740

traceback.print_exc()

2735

if x[1]:

2741

if x[1]:

2736

try:

2742

try:

2737

mod = imp.load_source(x[0], x[1])

2743

mod = imp.load_source(x[0], x[1])

2738

except Exception, inst:

2744

except Exception, inst:

2739

on_exception(Exception, inst)

2745

on_exception(Exception, inst)

2740

continue

2746

continue

2741

else:

2747

else:

2742

def importh(name):

2748

def importh(name):

2743

mod = __import__(name)

2749

mod = __import__(name)

2744

components = name.split('.')

2750

components = name.split('.')

2745

for comp in components[1:]:

2751

for comp in components[1:]:

2746

mod = getattr(mod, comp)

2752

mod = getattr(mod, comp)

2747

return mod

2753

return mod

2748

try:

2754

try:

2749

mod = importh(x[0])

2755

mod = importh(x[0])

2750

except Exception, inst:

2756

except Exception, inst:

2751

on_exception(Exception, inst)

2757

on_exception(Exception, inst)

2752

continue

2758

continue

2753

2759

2754

external.append(mod)

2760

external.append(mod)

2755

for x in external:

2761

for x in external:

2756

cmdtable = getattr(x, 'cmdtable', {})

2762

cmdtable = getattr(x, 'cmdtable', {})

2757

for t in cmdtable:

2763

for t in cmdtable:

2758

if t in table:

2764

if t in table:

2759

u.warn(_("module %s overrides %s\n") % (x.__name__, t))

2765

u.warn(_("module %s overrides %s\n") % (x.__name__, t))

2760

table.update(cmdtable)

2766

table.update(cmdtable)

2761

2767

2762

try:

2768

try:

2763

cmd, func, args, options, cmdoptions = parse(u, args)

2769

cmd, func, args, options, cmdoptions = parse(u, args)

2764

except ParseError, inst:

2770

except ParseError, inst:

2765

if inst.args[0]:

2771

if inst.args[0]:

2766

u.warn(_("hg %s: %s\n") % (inst.args[0], inst.args[1]))

2772

u.warn(_("hg %s: %s\n") % (inst.args[0], inst.args[1]))

2767

help_(u, inst.args[0])

2773

help_(u, inst.args[0])

2768

else:

2774

else:

2769

u.warn(_("hg: %s\n") % inst.args[1])

2775

u.warn(_("hg: %s\n") % inst.args[1])

2770

help_(u, 'shortlist')

2776

help_(u, 'shortlist')

2771

sys.exit(-1)

2777

sys.exit(-1)

2772

except AmbiguousCommand, inst:

2778

except AmbiguousCommand, inst:

2773

u.warn(_("hg: command '%s' is ambiguous.\n") % inst.args[0])

2779

u.warn(_("hg: command '%s' is ambiguous.\n") % inst.args[0])

2774

sys.exit(1)

2780

sys.exit(1)

2775

except UnknownCommand, inst:

2781

except UnknownCommand, inst:

2776

u.warn(_("hg: unknown command '%s'\n") % inst.args[0])

2782

u.warn(_("hg: unknown command '%s'\n") % inst.args[0])

2777

help_(u, 'shortlist')

2783

help_(u, 'shortlist')

2778

sys.exit(1)

2784

sys.exit(1)

2779

2785

2780

if options["time"]:

2786

if options["time"]:

2781

def get_times():

2787

def get_times():

2782

t = os.times()

2788

t = os.times()

2783

if t[4] == 0.0: # Windows leaves this as zero, so use time.clock()

2789

if t[4] == 0.0: # Windows leaves this as zero, so use time.clock()

2784

t = (t[0], t[1], t[2], t[3], time.clock())

2790

t = (t[0], t[1], t[2], t[3], time.clock())

2785

return t

2791

return t

2786

s = get_times()

2792

s = get_times()

2787

def print_time():

2793

def print_time():

2788

t = get_times()

2794

t = get_times()

2789

u.warn(_("Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n") %

2795

u.warn(_("Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n") %

2790

(t[4]-s[4], t[0]-s[0], t[2]-s[2], t[1]-s[1], t[3]-s[3]))

2796

(t[4]-s[4], t[0]-s[0], t[2]-s[2], t[1]-s[1], t[3]-s[3]))

2791

atexit.register(print_time)

2797

atexit.register(print_time)

2792

2798

2793

u.updateopts(options["verbose"], options["debug"], options["quiet"],

2799

u.updateopts(options["verbose"], options["debug"], options["quiet"],

2794

not options["noninteractive"])

2800

not options["noninteractive"])

2795

2801

2796

# enter the debugger before command execution

2802

# enter the debugger before command execution

2797

if options['debugger']:

2803

if options['debugger']:

2798

pdb.set_trace()

2804

pdb.set_trace()

2799

2805

2800

try:

2806

try:

2801

try:

2807

try:

2802

if options['help']:

2808

if options['help']:

2803

help_(u, cmd, options['version'])

2809

help_(u, cmd, options['version'])

2804

sys.exit(0)

2810

sys.exit(0)

2805

elif options['version']:

2811

elif options['version']:

2806

show_version(u)

2812

show_version(u)

2807

sys.exit(0)

2813

sys.exit(0)

2808

elif not cmd:

2814

elif not cmd:

2809

help_(u, 'shortlist')

2815

help_(u, 'shortlist')

2810

sys.exit(0)

2816

sys.exit(0)

2811

2817

2812

if options['cwd']:

2818

if options['cwd']:

2813

try:

2819

try:

2814

os.chdir(options['cwd'])

2820

os.chdir(options['cwd'])

2815

except OSError, inst:

2821

except OSError, inst:

2816

raise util.Abort('%s: %s' %

2822

raise util.Abort('%s: %s' %

2817

(options['cwd'], inst.strerror))

2823

(options['cwd'], inst.strerror))

2818

2824

2819

if cmd not in norepo.split():

2825

if cmd not in norepo.split():

2820

path = options["repository"] or ""

2826

path = options["repository"] or ""

2821

repo = hg.repository(ui=u, path=path)

2827

repo = hg.repository(ui=u, path=path)

2822

for x in external:

2828

for x in external:

2823

if hasattr(x, 'reposetup'):

2829

if hasattr(x, 'reposetup'):

2824

x.reposetup(u, repo)

2830

x.reposetup(u, repo)

2825

d = lambda: func(u, repo, *args, **cmdoptions)

2831

d = lambda: func(u, repo, *args, **cmdoptions)

2826

else:

2832

else:

2827

d = lambda: func(u, *args, **cmdoptions)

2833

d = lambda: func(u, *args, **cmdoptions)

2828

2834

2829

if options['profile']:

2835

if options['profile']:

2830

import hotshot, hotshot.stats

2836

import hotshot, hotshot.stats

2831

prof = hotshot.Profile("hg.prof")

2837

prof = hotshot.Profile("hg.prof")

2832

r = prof.runcall(d)

2838

r = prof.runcall(d)

2833

prof.close()

2839

prof.close()

2834

stats = hotshot.stats.load("hg.prof")

2840

stats = hotshot.stats.load("hg.prof")

2835

stats.strip_dirs()

2841

stats.strip_dirs()

2836

stats.sort_stats('time', 'calls')

2842

stats.sort_stats('time', 'calls')

2837

stats.print_stats(40)

2843

stats.print_stats(40)

2838

return r

2844

return r

2839

else:

2845

else:

2840

return d()

2846

return d()

2841

except:

2847

except:

2842

# enter the debugger when we hit an exception

2848

# enter the debugger when we hit an exception

2843

if options['debugger']:

2849

if options['debugger']:

2844

pdb.post_mortem(sys.exc_info()[2])

2850

pdb.post_mortem(sys.exc_info()[2])

2845

if options['traceback']:

2851

if options['traceback']:

2846

traceback.print_exc()

2852

traceback.print_exc()

2847

raise

2853

raise

2848

except hg.RepoError, inst:

2854

except hg.RepoError, inst:

2849

u.warn(_("abort: "), inst, "!\n")

2855

u.warn(_("abort: "), inst, "!\n")

2850

except revlog.RevlogError, inst:

2856

except revlog.RevlogError, inst:

2851

u.warn(_("abort: "), inst, "!\n")

2857

u.warn(_("abort: "), inst, "!\n")

2852

except SignalInterrupt:

2858

except SignalInterrupt:

2853

u.warn(_("killed!\n"))

2859

u.warn(_("killed!\n"))

2854

except KeyboardInterrupt:

2860

except KeyboardInterrupt:

2855

try:

2861

try:

2856

u.warn(_("interrupted!\n"))

2862

u.warn(_("interrupted!\n"))

2857

except IOError, inst:

2863

except IOError, inst:

2858

if inst.errno == errno.EPIPE:

2864

if inst.errno == errno.EPIPE:

2859

if u.debugflag:

2865

if u.debugflag:

2860

u.warn(_("\nbroken pipe\n"))

2866

u.warn(_("\nbroken pipe\n"))

2861

else:

2867

else:

2862

raise

2868

raise

2863

except IOError, inst:

2869

except IOError, inst:

2864

if hasattr(inst, "code"):

2870

if hasattr(inst, "code"):

2865

u.warn(_("abort: %s\n") % inst)

2871

u.warn(_("abort: %s\n") % inst)

2866

elif hasattr(inst, "reason"):

2872

elif hasattr(inst, "reason"):

2867

u.warn(_("abort: error: %s\n") % inst.reason[1])

2873

u.warn(_("abort: error: %s\n") % inst.reason[1])

2868

elif hasattr(inst, "args") and inst[0] == errno.EPIPE:

2874

elif hasattr(inst, "args") and inst[0] == errno.EPIPE:

2869

if u.debugflag:

2875

if u.debugflag:

2870

u.warn(_("broken pipe\n"))

2876

u.warn(_("broken pipe\n"))

2871

elif getattr(inst, "strerror", None):

2877

elif getattr(inst, "strerror", None):

2872

if getattr(inst, "filename", None):

2878

if getattr(inst, "filename", None):

2873

u.warn(_("abort: %s - %s\n") % (inst.strerror, inst.filename))

2879

u.warn(_("abort: %s - %s\n") % (inst.strerror, inst.filename))

2874

else:

2880

else:

2875

u.warn(_("abort: %s\n") % inst.strerror)

2881

u.warn(_("abort: %s\n") % inst.strerror)

2876

else:

2882

else:

2877

raise

2883

raise

2878

except OSError, inst:

2884

except OSError, inst:

2879

if hasattr(inst, "filename"):

2885

if hasattr(inst, "filename"):

2880

u.warn(_("abort: %s: %s\n") % (inst.strerror, inst.filename))

2886

u.warn(_("abort: %s: %s\n") % (inst.strerror, inst.filename))

2881

else:

2887

else:

2882

u.warn(_("abort: %s\n") % inst.strerror)

2888

u.warn(_("abort: %s\n") % inst.strerror)

2883

except util.Abort, inst:

2889

except util.Abort, inst:

2884

u.warn(_('abort: '), inst.args[0] % inst.args[1:], '\n')

2890

u.warn(_('abort: '), inst.args[0] % inst.args[1:], '\n')

2885

sys.exit(1)

2891

sys.exit(1)

2886

except TypeError, inst:

2892

except TypeError, inst:

2887

# was this an argument error?

2893

# was this an argument error?

2888

tb = traceback.extract_tb(sys.exc_info()[2])

2894

tb = traceback.extract_tb(sys.exc_info()[2])

2889

if len(tb) > 2: # no

2895

if len(tb) > 2: # no

2890

raise

2896

raise

2891

u.debug(inst, "\n")

2897

u.debug(inst, "\n")

2892

u.warn(_("%s: invalid arguments\n") % cmd)

2898

u.warn(_("%s: invalid arguments\n") % cmd)

2893

help_(u, cmd)

2899

help_(u, cmd)

2894

except AmbiguousCommand, inst:

2900

except AmbiguousCommand, inst:

2895

u.warn(_("hg: command '%s' is ambiguous.\n") % inst.args[0])

2901

u.warn(_("hg: command '%s' is ambiguous.\n") % inst.args[0])

2896

help_(u, 'shortlist')

2902

help_(u, 'shortlist')

2897

except UnknownCommand, inst:

2903

except UnknownCommand, inst:

2898

u.warn(_("hg: unknown command '%s'\n") % inst.args[0])

2904

u.warn(_("hg: unknown command '%s'\n") % inst.args[0])

2899

help_(u, 'shortlist')

2905

help_(u, 'shortlist')

2900

except SystemExit:

2906

except SystemExit:

2901

# don't catch this in the catch-all below

2907

# don't catch this in the catch-all below

2902

raise

2908

raise

2903

except:

2909

except:

2904

u.warn(_("** unknown exception encountered, details follow\n"))

2910

u.warn(_("** unknown exception encountered, details follow\n"))

2905

u.warn(_("** report bug details to mercurial@selenic.com\n"))

2911

u.warn(_("** report bug details to mercurial@selenic.com\n"))

2906

u.warn(_("** Mercurial Distributed SCM (version %s)\n")

2912

u.warn(_("** Mercurial Distributed SCM (version %s)\n")

2907

% version.get_version())

2913

% version.get_version())

2908

raise

2914

raise

2909

2915

2910

sys.exit(-1)

2916

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 node1:
+                    # 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()
                     if not node1:
                         node1 = repo.dirstate.parents()[0]
+                        change = repo.changelog.read(node1)
+                        mmap = repo.manifest.read(change[0])
+                        date1 = util.datestr(change[2])
                     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]
-                change = repo.changelog.read(node1)
-                mmap = repo.manifest.read(change[0])
-                date1 = util.datestr(change[2])
                 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.
                 """
                 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.
                 """
                 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)
                 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
                 directories.  This restores the contents of the affected files to
                 an unmodified state.
                 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...')),
                 "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...')),
                 "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')),
                 "tags": (tags, [], _('hg tags')),
                 "tip":
                     (tip,
                      [('b', 'branches', None, _('show branches')),
                       ('p', 'patch', None, _('show patch'))],
                      _('hg [-b] [-p] tip')),
                 "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)