upstream/mercurial-mirror Commit - r1889:46873091

1

# commands.py - command processing for mercurial

1

# commands.py - command processing for mercurial

2

#

2

#

3

4

#

4

#

5

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

5

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

6

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

6

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

7

8

from demandload import demandload

8

from demandload import demandload

9

from node import *

9

from node import *

10

from i18n import gettext as _

10

from i18n import gettext as _

11

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

11

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

12

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

12

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

13

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

13

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

14

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

14

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

15

16

class UnknownCommand(Exception):

16

class UnknownCommand(Exception):

17

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

17

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

18

class AmbiguousCommand(Exception):

18

class AmbiguousCommand(Exception):

19

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

19

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

20

21

def filterfiles(filters, files):

21

def filterfiles(filters, files):

22

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

22

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

23

24

for t in filters:

24

for t in filters:

25

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

25

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

26

t += "/"

26

t += "/"

27

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

27

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

28

return l

28

return l

29

30

def relpath(repo, args):

30

def relpath(repo, args):

31

cwd = repo.getcwd()

31

cwd = repo.getcwd()

32

if cwd:

32

if cwd:

33

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

33

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

34

return args

34

return args

35

36

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

36

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

37

cwd = repo.getcwd()

37

cwd = repo.getcwd()

38

if not pats and cwd:

38

if not pats and cwd:

39

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

39

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

40

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

40

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

41

cwd = ''

41

cwd = ''

42

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

42

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

43

opts.get('exclude'), head)

43

opts.get('exclude'), head)

44

45

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

45

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

46

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

46

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

47

exact = dict(zip(files, files))

47

exact = dict(zip(files, files))

48

def walk():

48

def walk():

49

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

49

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

50

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

50

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

51

return files, matchfn, walk()

51

return files, matchfn, walk()

52

53

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

53

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

54

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

54

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

55

for r in results:

55

for r in results:

56

yield r

56

yield r

57

58

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

58

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

59

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

59

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

60

61

Callers most commonly need to iterate backwards over the history

61

Callers most commonly need to iterate backwards over the history

62

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

62

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

63

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

63

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

64

65

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

65

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

66

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

66

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

67

order (usually backwards) to display it.

67

order (usually backwards) to display it.

68

69

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

69

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

70

getchange function returns the changelog entry for a numeric

70

getchange function returns the changelog entry for a numeric

71

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

71

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

72

the following forms:

72

the following forms:

73

74

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

74

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

75

positive if walking forwards through revs, last rev in the

75

positive if walking forwards through revs, last rev in the

76

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

76

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

77

78

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

78

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

79

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

79

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

80

possible display

80

possible display

81

82

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

82

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

83

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

83

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

84

85

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

85

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

86

if start < end:

86

if start < end:

87

while start < end:

87

while start < end:

88

yield start, min(windowsize, end-start)

88

yield start, min(windowsize, end-start)

89

start += windowsize

89

start += windowsize

90

if windowsize < sizelimit:

90

if windowsize < sizelimit:

91

windowsize *= 2

91

windowsize *= 2

92

else:

92

else:

93

while start > end:

93

while start > end:

94

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

94

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

95

start -= windowsize

95

start -= windowsize

96

if windowsize < sizelimit:

96

if windowsize < sizelimit:

97

windowsize *= 2

97

windowsize *= 2

98

99

100

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

100

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

101

102

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

102

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

103

return [], False, matchfn

103

return [], False, matchfn

104

105

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

105

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

106

wanted = {}

106

wanted = {}

107

slowpath = anypats

107

slowpath = anypats

108

fncache = {}

108

fncache = {}

109

110

chcache = {}

110

chcache = {}

111

def getchange(rev):

111

def getchange(rev):

112

ch = chcache.get(rev)

112

ch = chcache.get(rev)

113

if ch is None:

113

if ch is None:

114

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

114

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

115

return ch

115

return ch

116

117

if not slowpath and not files:

117

if not slowpath and not files:

118

# No files, no patterns. Display all revs.

118

# No files, no patterns. Display all revs.

119

wanted = dict(zip(revs, revs))

119

wanted = dict(zip(revs, revs))

120

if not slowpath:

120

if not slowpath:

121

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

121

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

122

def filerevgen(filelog):

122

def filerevgen(filelog):

123

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

123

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

124

revs = []

124

revs = []

125

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

125

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

126

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

126

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

127

revs.reverse()

127

revs.reverse()

128

for rev in revs:

128

for rev in revs:

129

yield rev

129

yield rev

130

131

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

131

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

132

for file_ in files:

132

for file_ in files:

133

filelog = repo.file(file_)

133

filelog = repo.file(file_)

134

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

134

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

135

# try to find matching entries on the slow path.

135

# try to find matching entries on the slow path.

136

if filelog.count() == 0:

136

if filelog.count() == 0:

137

slowpath = True

137

slowpath = True

138

break

138

break

139

for rev in filerevgen(filelog):

139

for rev in filerevgen(filelog):

140

if rev <= maxrev:

140

if rev <= maxrev:

141

if rev < minrev:

141

if rev < minrev:

142

break

142

break

143

fncache.setdefault(rev, [])

143

fncache.setdefault(rev, [])

144

fncache[rev].append(file_)

144

fncache[rev].append(file_)

145

wanted[rev] = 1

145

wanted[rev] = 1

146

if slowpath:

146

if slowpath:

147

# The slow path checks files modified in every changeset.

147

# The slow path checks files modified in every changeset.

148

def changerevgen():

148

def changerevgen():

149

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

149

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

150

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

150

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

151

yield j, getchange(j)[3]

151

yield j, getchange(j)[3]

152

153

for rev, changefiles in changerevgen():

153

for rev, changefiles in changerevgen():

154

matches = filter(matchfn, changefiles)

154

matches = filter(matchfn, changefiles)

155

if matches:

155

if matches:

156

fncache[rev] = matches

156

fncache[rev] = matches

157

wanted[rev] = 1

157

wanted[rev] = 1

158

159

def iterate():

159

def iterate():

160

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

160

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

161

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

161

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

162

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

162

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

163

if rev in wanted]

163

if rev in wanted]

164

srevs = list(nrevs)

164

srevs = list(nrevs)

165

srevs.sort()

165

srevs.sort()

166

for rev in srevs:

166

for rev in srevs:

167

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

167

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

168

yield 'add', rev, fns

168

yield 'add', rev, fns

169

for rev in nrevs:

169

for rev in nrevs:

170

yield 'iter', rev, None

170

yield 'iter', rev, None

171

return iterate(), getchange, matchfn

171

return iterate(), getchange, matchfn

172

173

revrangesep = ':'

173

revrangesep = ':'

174

175

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

175

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

176

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

176

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

177

if revlog is None:

177

if revlog is None:

178

revlog = repo.changelog

178

revlog = repo.changelog

179

revcount = revlog.count()

179

revcount = revlog.count()

180

def fix(val, defval):

180

def fix(val, defval):

181

if not val:

181

if not val:

182

return defval

182

return defval

183

try:

183

try:

184

num = int(val)

184

num = int(val)

185

if str(num) != val:

185

if str(num) != val:

186

raise ValueError

186

raise ValueError

187

if num < 0:

187

if num < 0:

188

num += revcount

188

num += revcount

189

if num < 0:

189

if num < 0:

190

num = 0

190

num = 0

191

elif num >= revcount:

191

elif num >= revcount:

192

raise ValueError

192

raise ValueError

193

except ValueError:

193

except ValueError:

194

try:

194

try:

195

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

195

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

196

except KeyError:

196

except KeyError:

197

try:

197

try:

198

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

198

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

199

except KeyError:

199

except KeyError:

200

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

200

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

201

return num

201

return num

202

seen = {}

202

seen = {}

203

for spec in revs:

203

for spec in revs:

204

if spec.find(revrangesep) >= 0:

204

if spec.find(revrangesep) >= 0:

205

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

205

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

206

start = fix(start, 0)

206

start = fix(start, 0)

207

end = fix(end, revcount - 1)

207

end = fix(end, revcount - 1)

208

step = start > end and -1 or 1

208

step = start > end and -1 or 1

209

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

209

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

210

if rev in seen:

210

if rev in seen:

211

continue

211

continue

212

seen[rev] = 1

212

seen[rev] = 1

213

yield str(rev)

213

yield str(rev)

214

else:

214

else:

215

rev = fix(spec, None)

215

rev = fix(spec, None)

216

if rev in seen:

216

if rev in seen:

217

continue

217

continue

218

seen[rev] = 1

218

seen[rev] = 1

219

yield str(rev)

219

yield str(rev)

220

221

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

221

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

222

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

222

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

223

node_expander = {

223

node_expander = {

224

'H': lambda: hex(node),

224

'H': lambda: hex(node),

225

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

225

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

226

'h': lambda: short(node),

226

'h': lambda: short(node),

227

}

227

}

228

expander = {

228

expander = {

229

'%': lambda: '%',

229

'%': lambda: '%',

230

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

230

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

231

}

231

}

232

233

try:

233

try:

234

if node:

234

if node:

235

expander.update(node_expander)

235

expander.update(node_expander)

236

if node and revwidth is not None:

236

if node and revwidth is not None:

237

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

237

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

238

if total is not None:

238

if total is not None:

239

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

239

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

240

if seqno is not None:

240

if seqno is not None:

241

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

241

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

242

if total is not None and seqno is not None:

242

if total is not None and seqno is not None:

243

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

243

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

244

if pathname is not None:

244

if pathname is not None:

245

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

245

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

246

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

246

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

247

expander['p'] = lambda: pathname

247

expander['p'] = lambda: pathname

248

249

newname = []

249

newname = []

250

patlen = len(pat)

250

patlen = len(pat)

251

i = 0

251

i = 0

252

while i < patlen:

252

while i < patlen:

253

c = pat[i]

253

c = pat[i]

254

if c == '%':

254

if c == '%':

255

i += 1

255

i += 1

256

c = pat[i]

256

c = pat[i]

257

c = expander[c]()

257

c = expander[c]()

258

newname.append(c)

258

newname.append(c)

259

i += 1

259

i += 1

260

return ''.join(newname)

260

return ''.join(newname)

261

except KeyError, inst:

261

except KeyError, inst:

262

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

262

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

263

inst.args[0])

263

inst.args[0])

264

265

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

265

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

266

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

266

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

267

if not pat or pat == '-':

267

if not pat or pat == '-':

268

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

268

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

269

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

269

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

270

return pat

270

return pat

271

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

271

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

272

return pat

272

return pat

273

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

273

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

274

pathname),

274

pathname),

275

mode)

275

mode)

276

277

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

277

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

278

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

278

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

279

if not node1:

279

if not node1:

280

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

280

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

281

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

281

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

282

# with repo.changes and the revlog cache.

282

# with repo.changes and the revlog cache.

283

change = repo.changelog.read(node1)

283

change = repo.changelog.read(node1)

284

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

284

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

285

date1 = util.datestr(change[2])

285

date1 = util.datestr(change[2])

286

287

if not changes:

287

if not changes:

288

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

288

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

289

modified, added, removed, deleted, unknown = changes

289

modified, added, removed, deleted, unknown = changes

290

if files:

290

if files:

291

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

291

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

292

(modified, added, removed))

292

(modified, added, removed))

293

294

if not modified and not added and not removed:

294

if not modified and not added and not removed:

295

return

295

return

296

297

if node2:

297

if node2:

298

change = repo.changelog.read(node2)

298

change = repo.changelog.read(node2)

299

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

299

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

300

date2 = util.datestr(change[2])

300

date2 = util.datestr(change[2])

301

def read(f):

301

def read(f):

302

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

302

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

303

else:

303

else:

304

date2 = util.datestr()

304

date2 = util.datestr()

305

def read(f):

305

def read(f):

306

return repo.wread(f)

306

return repo.wread(f)

307

308

if ui.quiet:

308

if ui.quiet:

309

r = None

309

r = None

310

else:

310

else:

311

hexfunc = ui.verbose and hex or short

311

hexfunc = ui.verbose and hex or short

312

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

312

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

313

314

diffopts = ui.diffopts()

314

diffopts = ui.diffopts()

315

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

315

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

316

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

316

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

317

for f in modified:

317

for f in modified:

318

to = None

318

to = None

319

if f in mmap:

319

if f in mmap:

320

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

320

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

321

tn = read(f)

321

tn = read(f)

322

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

322

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

323

showfunc=showfunc, ignorews=ignorews))

323

showfunc=showfunc, ignorews=ignorews))

324

for f in added:

324

for f in added:

325

to = None

325

to = None

326

tn = read(f)

326

tn = read(f)

327

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

327

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

328

showfunc=showfunc, ignorews=ignorews))

328

showfunc=showfunc, ignorews=ignorews))

329

for f in removed:

329

for f in removed:

330

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

330

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

331

tn = None

331

tn = None

332

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

332

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

333

showfunc=showfunc, ignorews=ignorews))

333

showfunc=showfunc, ignorews=ignorews))

334

335

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

335

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

336

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

336

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

337

user = revcache.get(rev)

337

user = revcache.get(rev)

338

if user is None:

338

if user is None:

339

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

339

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

340

return user

340

return user

341

342

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

342

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

343

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

343

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

344

log = repo.changelog

344

log = repo.changelog

345

if changenode is None:

345

if changenode is None:

346

changenode = log.node(rev)

346

changenode = log.node(rev)

347

elif not rev:

347

elif not rev:

348

rev = log.rev(changenode)

348

rev = log.rev(changenode)

349

350

if ui.quiet:

350

if ui.quiet:

351

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

351

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

352

return

352

return

353

354

changes = log.read(changenode)

354

changes = log.read(changenode)

355

date = util.datestr(changes[2])

355

date = util.datestr(changes[2])

356

357

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

357

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

358

for p in log.parents(changenode)

358

for p in log.parents(changenode)

359

if ui.debugflag or p != nullid]

359

if ui.debugflag or p != nullid]

360

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

360

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

361

parents = []

361

parents = []

362

363

if ui.verbose:

363

if ui.verbose:

364

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

364

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

365

else:

365

else:

366

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

366

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

367

368

for tag in repo.nodetags(changenode):

368

for tag in repo.nodetags(changenode):

369

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

369

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

370

for parent in parents:

370

for parent in parents:

371

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

371

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

372

373

if brinfo and changenode in brinfo:

373

if brinfo and changenode in brinfo:

374

br = brinfo[changenode]

374

br = brinfo[changenode]

375

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

375

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

376

377

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

377

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

378

hex(changes[0])))

378

hex(changes[0])))

379

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

379

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

380

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

380

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

381

382

if ui.debugflag:

382

if ui.debugflag:

383

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

383

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

384

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

384

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

385

if value:

385

if value:

386

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

386

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

387

else:

387

else:

388

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

388

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

389

390

description = changes[4].strip()

390

description = changes[4].strip()

391

if description:

391

if description:

392

if ui.verbose:

392

if ui.verbose:

393

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

393

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

394

ui.status(description)

394

ui.status(description)

395

ui.status("\n\n")

395

ui.status("\n\n")

396

else:

396

else:

397

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

397

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

398

ui.status("\n")

398

ui.status("\n")

399

400

def show_version(ui):

400

def show_version(ui):

401

"""output version and copyright information"""

401

"""output version and copyright information"""

402

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

402

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

403

% version.get_version())

403

% version.get_version())

404

ui.status(_(

404

ui.status(_(

405

406

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

406

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

407

"There is NO\nwarranty; "

407

"There is NO\nwarranty; "

408

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

408

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

409

))

409

))

410

411

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

411

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

412

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

412

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

413

option_lists = []

413

option_lists = []

414

if cmd and cmd != 'shortlist':

414

if cmd and cmd != 'shortlist':

415

if with_version:

415

if with_version:

416

show_version(ui)

416

show_version(ui)

417

ui.write('\n')

417

ui.write('\n')

418

aliases, i = find(cmd)

418

aliases, i = find(cmd)

419

# synopsis

419

# synopsis

420

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

420

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

421

422

# description

422

# description

423

doc = i[0].__doc__

423

doc = i[0].__doc__

424

if not doc:

424

if not doc:

425

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

425

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

426

if ui.quiet:

426

if ui.quiet:

427

doc = doc.splitlines(0)[0]

427

doc = doc.splitlines(0)[0]

428

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

428

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

429

430

if not ui.quiet:

430

if not ui.quiet:

431

# aliases

431

# aliases

432

if len(aliases) > 1:

432

if len(aliases) > 1:

433

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

433

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

434

435

# options

435

# options

436

if i[1]:

436

if i[1]:

437

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

437

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

438

439

else:

439

else:

440

# program name

440

# program name

441

if ui.verbose or with_version:

441

if ui.verbose or with_version:

442

show_version(ui)

442

show_version(ui)

443

else:

443

else:

444

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

444

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

445

ui.status('\n')

445

ui.status('\n')

446

447

# list of commands

447

# list of commands

448

if cmd == "shortlist":

448

if cmd == "shortlist":

449

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

449

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

450

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

450

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

451

elif ui.verbose:

451

elif ui.verbose:

452

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

452

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

453

else:

453

else:

454

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

454

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

455

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

455

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

456

457

h = {}

457

h = {}

458

cmds = {}

458

cmds = {}

459

for c, e in table.items():

459

for c, e in table.items():

460

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

460

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

461

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

461

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

462

continue

462

continue

463

f = f.lstrip("^")

463

f = f.lstrip("^")

464

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

464

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

465

continue

465

continue

466

doc = e[0].__doc__

466

doc = e[0].__doc__

467

if not doc:

467

if not doc:

468

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

468

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

469

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

469

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

470

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

470

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

471

472

fns = h.keys()

472

fns = h.keys()

473

fns.sort()

473

fns.sort()

474

m = max(map(len, fns))

474

m = max(map(len, fns))

475

for f in fns:

475

for f in fns:

476

if ui.verbose:

476

if ui.verbose:

477

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

477

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

478

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

478

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

479

else:

479

else:

480

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

480

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

481

482

# global options

482

# global options

483

if ui.verbose:

483

if ui.verbose:

484

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

484

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

485

486

# list all option lists

486

# list all option lists

487

opt_output = []

487

opt_output = []

488

for title, options in option_lists:

488

for title, options in option_lists:

489

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

489

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

490

for shortopt, longopt, default, desc in options:

490

for shortopt, longopt, default, desc in options:

491

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

491

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

492

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

492

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

493

"%s%s" % (desc,

493

"%s%s" % (desc,

494

default

494

default

495

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

495

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

496

or "")))

496

or "")))

497

498

if opt_output:

498

if opt_output:

499

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

499

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

500

for first, second in opt_output:

500

for first, second in opt_output:

501

if second:

501

if second:

502

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

502

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

503

else:

503

else:

504

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

504

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

505

506

# Commands start here, listed alphabetically

506

# Commands start here, listed alphabetically

507

508

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

508

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

509

"""add the specified files on the next commit

509

"""add the specified files on the next commit

510

511

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

511

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

512

513

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

513

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

514

515

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

515

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

516

"""

516

"""

517

518

names = []

518

names = []

519

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

519

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

520

if exact:

520

if exact:

521

if ui.verbose:

521

if ui.verbose:

522

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

522

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

523

names.append(abs)

523

names.append(abs)

524

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

524

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

525

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

525

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

526

names.append(abs)

526

names.append(abs)

527

repo.add(names)

527

repo.add(names)

528

529

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

529

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

530

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

530

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

531

532

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

532

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

533

534

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

534

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

535

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

535

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

536

"""

536

"""

537

return addremove_lock(ui, repo, pats, opts)

537

return addremove_lock(ui, repo, pats, opts)

538

539

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

539

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

540

add, remove = [], []

540

add, remove = [], []

541

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

541

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

542

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

542

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

543

add.append(abs)

543

add.append(abs)

544

if ui.verbose or not exact:

544

if ui.verbose or not exact:

545

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

545

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

546

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

546

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

547

remove.append(abs)

547

remove.append(abs)

548

if ui.verbose or not exact:

548

if ui.verbose or not exact:

549

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

549

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

550

repo.add(add, wlock=wlock)

550

repo.add(add, wlock=wlock)

551

repo.remove(remove, wlock=wlock)

551

repo.remove(remove, wlock=wlock)

552

553

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

553

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

554

"""show changeset information per file line

554

"""show changeset information per file line

555

556

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

556

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

557

558

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

558

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

559

place.

559

place.

560

561

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

561

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

562

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

562

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

563

anyway, probably with undesirable results.

563

anyway, probably with undesirable results.

564

"""

564

"""

565

def getnode(rev):

565

def getnode(rev):

566

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

566

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

567

568

ucache = {}

568

ucache = {}

569

def getname(rev):

569

def getname(rev):

570

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

570

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

571

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

571

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

572

573

dcache = {}

573

dcache = {}

574

def getdate(rev):

574

def getdate(rev):

575

datestr = dcache.get(rev)

575

datestr = dcache.get(rev)

576

if datestr is None:

576

if datestr is None:

577

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

577

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

578

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

578

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

579

return datestr

579

return datestr

580

581

if not pats:

581

if not pats:

582

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

582

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

583

584

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

584

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

585

['date', getdate]]

585

['date', getdate]]

586

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

586

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

587

opts['number'] = 1

587

opts['number'] = 1

588

589

if opts['rev']:

589

if opts['rev']:

590

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

590

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

591

else:

591

else:

592

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

592

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

593

change = repo.changelog.read(node)

593

change = repo.changelog.read(node)

594

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

594

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

595

596

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

596

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

597

f = repo.file(abs)

597

f = repo.file(abs)

598

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

598

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

599

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

599

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

600

continue

600

continue

601

602

lines = f.annotate(mmap[abs])

602

lines = f.annotate(mmap[abs])

603

pieces = []

603

pieces = []

604

605

for o, f in opmap:

605

for o, f in opmap:

606

if opts[o]:

606

if opts[o]:

607

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

607

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

608

if l:

608

if l:

609

m = max(map(len, l))

609

m = max(map(len, l))

610

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

610

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

611

612

if pieces:

612

if pieces:

613

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

613

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

614

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

614

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

615

616

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

616

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

617

"""create a changegroup file

617

"""create a changegroup file

618

619

Generate a compressed changegroup file collecting all changesets

619

Generate a compressed changegroup file collecting all changesets

620

not found in the other repository.

620

not found in the other repository.

621

622

This file can then be transferred using conventional means and

622

This file can then be transferred using conventional means and

623

applied to another repository with the unbundle command. This is

623

applied to another repository with the unbundle command. This is

624

useful when native push and pull are not available or when

624

useful when native push and pull are not available or when

625

exporting an entire repository is undesirable. The standard file

625

exporting an entire repository is undesirable. The standard file

626

extension is ".hg".

626

extension is ".hg".

627

628

Unlike import/export, this exactly preserves all changeset

628

Unlike import/export, this exactly preserves all changeset

629

contents including permissions, rename data, and revision history.

629

contents including permissions, rename data, and revision history.

630

"""

630

"""

631

f = open(fname, "wb")

631

f = open(fname, "wb")

632

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

632

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

633

other = hg.repository(ui, dest)

633

other = hg.repository(ui, dest)

634

o = repo.findoutgoing(other)

634

o = repo.findoutgoing(other)

635

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

635

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

636

637

try:

637

try:

638

f.write("HG10")

638

f.write("HG10")

639

z = bz2.BZ2Compressor(9)

639

z = bz2.BZ2Compressor(9)

640

while 1:

640

while 1:

641

chunk = cg.read(4096)

641

chunk = cg.read(4096)

642

if not chunk:

642

if not chunk:

643

break

643

break

644

f.write(z.compress(chunk))

644

f.write(z.compress(chunk))

645

f.write(z.flush())

645

f.write(z.flush())

646

except:

646

except:

647

os.unlink(fname)

647

os.unlink(fname)

648

raise

648

raise

649

650

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

650

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

651

"""output the latest or given revisions of files

651

"""output the latest or given revisions of files

652

653

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

653

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

654

If no revision is given then the tip is used.

654

If no revision is given then the tip is used.

655

656

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

656

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

657

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

657

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

658

for the export command, with the following additions:

658

for the export command, with the following additions:

659

660

%s basename of file being printed

660

%s basename of file being printed

661

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

661

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

662

%p root-relative path name of file being printed

662

%p root-relative path name of file being printed

663

"""

663

"""

664

mf = {}

664

mf = {}

665

rev = opts['rev']

665

rev = opts['rev']

666

if rev:

666

if rev:

667

node = repo.lookup(rev)

667

node = repo.lookup(rev)

668

else:

668

else:

669

node = repo.changelog.tip()

669

node = repo.changelog.tip()

670

change = repo.changelog.read(node)

670

change = repo.changelog.read(node)

671

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

671

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

672

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

672

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

673

r = repo.file(abs)

673

r = repo.file(abs)

674

n = mf[abs]

674

n = mf[abs]

675

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

675

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

676

fp.write(r.read(n))

676

fp.write(r.read(n))

677

678

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

678

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

679

"""make a copy of an existing repository

679

"""make a copy of an existing repository

680

681

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

681

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

682

683

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

683

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

684

basename of the source.

684

basename of the source.

685

686

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

686

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

687

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

687

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

688

689

For efficiency, hardlinks are used for cloning whenever the source

689

For efficiency, hardlinks are used for cloning whenever the source

690

and destination are on the same filesystem. Some filesystems,

690

and destination are on the same filesystem. Some filesystems,

691

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

691

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

692

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

692

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

693

hardlinking.

693

hardlinking.

694

695

See pull for valid source format details.

695

See pull for valid source format details.

696

"""

696

"""

697

if dest is None:

697

if dest is None:

698

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

698

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

699

700

if os.path.exists(dest):

700

if os.path.exists(dest):

701

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

701

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

702

703

dest = os.path.realpath(dest)

703

dest = os.path.realpath(dest)

704

705

class Dircleanup(object):

705

class Dircleanup(object):

706

def __init__(self, dir_):

706

def __init__(self, dir_):

707

self.rmtree = shutil.rmtree

707

self.rmtree = shutil.rmtree

708

self.dir_ = dir_

708

self.dir_ = dir_

709

os.mkdir(dir_)

709

os.mkdir(dir_)

710

def close(self):

710

def close(self):

711

self.dir_ = None

711

self.dir_ = None

712

def __del__(self):

712

def __del__(self):

713

if self.dir_:

713

if self.dir_:

714

self.rmtree(self.dir_, True)

714

self.rmtree(self.dir_, True)

715

716

if opts['ssh']:

716

if opts['ssh']:

717

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

717

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

718

if opts['remotecmd']:

718

if opts['remotecmd']:

719

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

719

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

720

721

if not os.path.exists(source):

721

if not os.path.exists(source):

722

source = ui.expandpath(source)

722

source = ui.expandpath(source)

723

724

d = Dircleanup(dest)

724

d = Dircleanup(dest)

725

abspath = source

725

abspath = source

726

other = hg.repository(ui, source)

726

other = hg.repository(ui, source)

727

728

copy = False

728

copy = False

729

if other.dev() != -1:

729

if other.dev() != -1:

730

abspath = os.path.abspath(source)

730

abspath = os.path.abspath(source)

731

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

731

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

732

copy = True

732

copy = True

733

734

if copy:

734

if copy:

735

try:

735

try:

736

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

736

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

737

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

737

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

738

# not pointed to by changesets, thus causing verify to

738

# not pointed to by changesets, thus causing verify to

739

# fail

739

# fail

740

l1 = other.lock()

740

l1 = other.lock()

741

except lock.LockException:

741

except lock.LockException:

742

copy = False

742

copy = False

743

744

if copy:

744

if copy:

745

# we lock here to avoid premature writing to the target

745

# we lock here to avoid premature writing to the target

746

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

746

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

747

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

747

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

748

749

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

749

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

750

for f in files.split():

750

for f in files.split():

751

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

751

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

752

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

752

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

753

try:

753

try:

754

util.copyfiles(src, dst)

754

util.copyfiles(src, dst)

755

except OSError, inst:

755

except OSError, inst:

756

if inst.errno != errno.ENOENT:

756

if inst.errno != errno.ENOENT:

757

raise

757

raise

758

759

repo = hg.repository(ui, dest)

759

repo = hg.repository(ui, dest)

760

761

else:

761

else:

762

revs = None

762

revs = None

763

if opts['rev']:

763

if opts['rev']:

764

if not other.local():

764

if not other.local():

765

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

765

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

766

raise util.Abort(error)

766

raise util.Abort(error)

767

else:

767

else:

768

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

768

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

769

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

769

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

770

repo.pull(other, heads = revs)

770

repo.pull(other, heads = revs)

771

772

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

772

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

773

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

773

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

774

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

774

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

775

f.close()

775

f.close()

776

777

if not opts['noupdate']:

777

if not opts['noupdate']:

778

update(repo.ui, repo)

778

update(repo.ui, repo)

779

780

d.close()

780

d.close()

781

782

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

782

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

783

"""commit the specified files or all outstanding changes

783

"""commit the specified files or all outstanding changes

784

785

Commit changes to the given files into the repository.

785

Commit changes to the given files into the repository.

786

787

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

787

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

788

will be commited.

788

will be commited.

789

790

The HGEDITOR or EDITOR environment variables are used to start an

790

The HGEDITOR or EDITOR environment variables are used to start an

791

editor to add a commit comment.

791

editor to add a commit comment.

792

"""

792

"""

793

message = opts['message']

793

message = opts['message']

794

logfile = opts['logfile']

794

logfile = opts['logfile']

795

796

if message and logfile:

796

if message and logfile:

797

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

797

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

798

'exclusive'))

798

'exclusive'))

799

if not message and logfile:

799

if not message and logfile:

800

try:

800

try:

801

if logfile == '-':

801

if logfile == '-':

802

message = sys.stdin.read()

802

message = sys.stdin.read()

803

else:

803

else:

804

message = open(logfile).read()

804

message = open(logfile).read()

805

except IOError, inst:

805

except IOError, inst:

806

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

806

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

807

(logfile, inst.strerror))

807

(logfile, inst.strerror))

808

809

if opts['addremove']:

809

if opts['addremove']:

810

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

810

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

811

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

811

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

812

if pats:

812

if pats:

813

modified, added, removed, deleted, unknown = (

813

modified, added, removed, deleted, unknown = (

814

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

814

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

815

files = modified + added + removed

815

files = modified + added + removed

816

else:

816

else:

817

files = []

817

files = []

818

try:

818

try:

819

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

819

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

820

except ValueError, inst:

820

except ValueError, inst:

821

raise util.Abort(str(inst))

821

raise util.Abort(str(inst))

822

823

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

823

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

824

# called with the repo lock held

824

# called with the repo lock held

825

cwd = repo.getcwd()

825

cwd = repo.getcwd()

826

errors = 0

826

errors = 0

827

copied = []

827

copied = []

828

targets = {}

828

targets = {}

829

830

def okaytocopy(abs, rel, exact):

830

def okaytocopy(abs, rel, exact):

831

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

831

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

832

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

832

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

833

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

833

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

834

state = repo.dirstate.state(abs)

834

state = repo.dirstate.state(abs)

835

reason = reasons.get(state)

835

reason = reasons.get(state)

836

if reason:

836

if reason:

837

if state == 'a':

837

if state == 'a':

838

origsrc = repo.dirstate.copied(abs)

838

origsrc = repo.dirstate.copied(abs)

839

if origsrc is not None:

839

if origsrc is not None:

840

return origsrc

840

return origsrc

841

if exact:

841

if exact:

842

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

842

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

843

else:

843

else:

844

return abs

844

return abs

845

846

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

846

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

847

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

847

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

848

reltarget = util.pathto(cwd, abstarget)

848

reltarget = util.pathto(cwd, abstarget)

849

prevsrc = targets.get(abstarget)

849

prevsrc = targets.get(abstarget)

850

if prevsrc is not None:

850

if prevsrc is not None:

851

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

851

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

852

(reltarget, abssrc, prevsrc))

852

(reltarget, abssrc, prevsrc))

853

return

853

return

854

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

854

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

855

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

855

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

856

if not opts['force']:

856

if not opts['force']:

857

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

857

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

858

reltarget)

858

reltarget)

859

return

859

return

860

if not opts['after']:

860

if not opts['after']:

861

os.unlink(reltarget)

861

os.unlink(reltarget)

862

if opts['after']:

862

if opts['after']:

863

if not os.path.exists(reltarget):

863

if not os.path.exists(reltarget):

864

return

864

return

865

else:

865

else:

866

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

866

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

867

if not os.path.isdir(targetdir):

867

if not os.path.isdir(targetdir):

868

os.makedirs(targetdir)

868

os.makedirs(targetdir)

869

try:

869

try:

870

restore = repo.dirstate.state(abstarget) == 'r'

870

restore = repo.dirstate.state(abstarget) == 'r'

871

if restore:

871

if restore:

872

repo.undelete([abstarget], wlock)

872

repo.undelete([abstarget], wlock)

873

try:

873

try:

874

shutil.copyfile(relsrc, reltarget)

874

shutil.copyfile(relsrc, reltarget)

875

shutil.copymode(relsrc, reltarget)

875

shutil.copymode(relsrc, reltarget)

876

restore = False

876

restore = False

877

finally:

877

finally:

878

if restore:

878

if restore:

879

repo.remove([abstarget], wlock)

879

repo.remove([abstarget], wlock)

880

except shutil.Error, inst:

880

except shutil.Error, inst:

881

raise util.Abort(str(inst))

881

raise util.Abort(str(inst))

882

except IOError, inst:

882

except IOError, inst:

883

if inst.errno == errno.ENOENT:

883

if inst.errno == errno.ENOENT:

884

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

884

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

885

else:

885

else:

886

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

886

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

887

(relsrc, inst.strerror))

887

(relsrc, inst.strerror))

888

errors += 1

888

errors += 1

889

return

889

return

890

if ui.verbose or not exact:

890

if ui.verbose or not exact:

891

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

891

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

892

targets[abstarget] = abssrc

892

targets[abstarget] = abssrc

893

if abstarget != origsrc:

893

if abstarget != origsrc:

894

repo.copy(origsrc, abstarget, wlock)

894

repo.copy(origsrc, abstarget, wlock)

895

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

895

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

896

897

def targetpathfn(pat, dest, srcs):

897

def targetpathfn(pat, dest, srcs):

898

if os.path.isdir(pat):

898

if os.path.isdir(pat):

899

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

899

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

900

if destdirexists:

900

if destdirexists:

901

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

901

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

902

else:

902

else:

903

striplen = len(abspfx)

903

striplen = len(abspfx)

904

if striplen:

904

if striplen:

905

striplen += len(os.sep)

905

striplen += len(os.sep)

906

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

906

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

907

elif destdirexists:

907

elif destdirexists:

908

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

908

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

909

else:

909

else:

910

res = lambda p: dest

910

res = lambda p: dest

911

return res

911

return res

912

913

def targetpathafterfn(pat, dest, srcs):

913

def targetpathafterfn(pat, dest, srcs):

914

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

914

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

915

# a mercurial pattern

915

# a mercurial pattern

916

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

916

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

917

else:

917

else:

918

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

918

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

919

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

919

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

920

# A directory. Either the target path contains the last

920

# A directory. Either the target path contains the last

921

# component of the source path or it does not.

921

# component of the source path or it does not.

922

def evalpath(striplen):

922

def evalpath(striplen):

923

score = 0

923

score = 0

924

for s in srcs:

924

for s in srcs:

925

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

925

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

926

if os.path.exists(t):

926

if os.path.exists(t):

927

score += 1

927

score += 1

928

return score

928

return score

929

930

striplen = len(abspfx)

930

striplen = len(abspfx)

931

if striplen:

931

if striplen:

932

striplen += len(os.sep)

932

striplen += len(os.sep)

933

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

933

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

934

score = evalpath(striplen)

934

score = evalpath(striplen)

935

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

935

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

936

if striplen1:

936

if striplen1:

937

striplen1 += len(os.sep)

937

striplen1 += len(os.sep)

938

if evalpath(striplen1) > score:

938

if evalpath(striplen1) > score:

939

striplen = striplen1

939

striplen = striplen1

940

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

940

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

941

else:

941

else:

942

# a file

942

# a file

943

if destdirexists:

943

if destdirexists:

944

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

944

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

945

else:

945

else:

946

res = lambda p: dest

946

res = lambda p: dest

947

return res

947

return res

948

949

950

pats = list(pats)

950

pats = list(pats)

951

if not pats:

951

if not pats:

952

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

952

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

953

if len(pats) == 1:

953

if len(pats) == 1:

954

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

954

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

955

dest = pats.pop()

955

dest = pats.pop()

956

destdirexists = os.path.isdir(dest)

956

destdirexists = os.path.isdir(dest)

957

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

957

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

958

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

958

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

959

'existing directory'))

959

'existing directory'))

960

if opts['after']:

960

if opts['after']:

961

tfn = targetpathafterfn

961

tfn = targetpathafterfn

962

else:

962

else:

963

tfn = targetpathfn

963

tfn = targetpathfn

964

copylist = []

964

copylist = []

965

for pat in pats:

965

for pat in pats:

966

srcs = []

966

srcs = []

967

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

967

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

968

origsrc = okaytocopy(abssrc, relsrc, exact)

968

origsrc = okaytocopy(abssrc, relsrc, exact)

969

if origsrc:

969

if origsrc:

970

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

970

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

971

if not srcs:

971

if not srcs:

972

continue

972

continue

973

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

973

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

974

if not copylist:

974

if not copylist:

975

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

975

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

976

977

for targetpath, srcs in copylist:

977

for targetpath, srcs in copylist:

978

for origsrc, abssrc, relsrc, exact in srcs:

978

for origsrc, abssrc, relsrc, exact in srcs:

979

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

979

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

980

981

if errors:

981

if errors:

982

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

982

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

983

return errors, copied

983

return errors, copied

984

985

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

985

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

986

"""mark files as copied for the next commit

986

"""mark files as copied for the next commit

987

988

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

988

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

989

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

989

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

990

there can only be one source.

990

there can only be one source.

991

992

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

992

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

993

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

993

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

994

operation is recorded, but no copying is performed.

994

operation is recorded, but no copying is performed.

995

996

This command takes effect in the next commit.

996

This command takes effect in the next commit.

997

998

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

998

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

999

should properly record copied files, this information is not yet

999

should properly record copied files, this information is not yet

1000

fully used by merge, nor fully reported by log.

1000

fully used by merge, nor fully reported by log.

1001

"""

1001

"""

1002

try:

1002

try:

1003

wlock = repo.wlock(0)

1003

wlock = repo.wlock(0)

1004

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

1004

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

1005

except lock.LockHeld, inst:

1005

except lock.LockHeld, inst:

1006

ui.warn(_("repository lock held by %s\n") % inst.args[0])

1006

ui.warn(_("repository lock held by %s\n") % inst.args[0])

1007

errs = 1

1007

errs = 1

1008

return errs

1008

return errs

1009

1010

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

1010

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

1011

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

1011

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

1012

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

1012

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

1013

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

1013

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

1014

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

1014

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

1015

1016

def debugcomplete(ui, cmd):

1016

def debugcomplete(ui, cmd):

1017

"""returns the completion list associated with the given command"""

1017

"""returns the completion list associated with the given command"""

1018

clist = findpossible(cmd).keys()

1018

clist = findpossible(cmd).keys()

1019

clist.sort()

1019

clist.sort()

1020

ui.write("%s\n" % " ".join(clist))

1020

ui.write("%s\n" % " ".join(clist))

1021

1022

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

1022

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

1023

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

1023

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

1024

if not rev:

1024

if not rev:

1025

rev = repo.changelog.tip()

1025

rev = repo.changelog.tip()

1026

else:

1026

else:

1027

rev = repo.lookup(rev)

1027

rev = repo.lookup(rev)

1028

change = repo.changelog.read(rev)

1028

change = repo.changelog.read(rev)

1029

n = change[0]

1029

n = change[0]

1030

files = repo.manifest.readflags(n)

1030

files = repo.manifest.readflags(n)

1031

wlock = repo.wlock()

1031

wlock = repo.wlock()

1032

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

1032

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

1033

1034

def debugcheckstate(ui, repo):

1034

def debugcheckstate(ui, repo):

1035

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

1035

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

1036

parent1, parent2 = repo.dirstate.parents()

1036

parent1, parent2 = repo.dirstate.parents()

1037

repo.dirstate.read()

1037

repo.dirstate.read()

1038

dc = repo.dirstate.map

1038

dc = repo.dirstate.map

1039

keys = dc.keys()

1039

keys = dc.keys()

1040

keys.sort()

1040

keys.sort()

1041

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

1041

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

1042

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

1042

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

1043

m1 = repo.manifest.read(m1n)

1043

m1 = repo.manifest.read(m1n)

1044

m2 = repo.manifest.read(m2n)

1044

m2 = repo.manifest.read(m2n)

1045

errors = 0

1045

errors = 0

1046

for f in dc:

1046

for f in dc:

1047

state = repo.dirstate.state(f)

1047

state = repo.dirstate.state(f)

1048

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

1048

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

1049

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

1049

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

1050

errors += 1

1050

errors += 1

1051

if state in "a" and f in m1:

1051

if state in "a" and f in m1:

1052

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

1052

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

1053

errors += 1

1053

errors += 1

1054

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

1054

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

1055

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

1055

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

1056

(f, state))

1056

(f, state))

1057

errors += 1

1057

errors += 1

1058

for f in m1:

1058

for f in m1:

1059

state = repo.dirstate.state(f)

1059

state = repo.dirstate.state(f)

1060

if state not in "nrm":

1060

if state not in "nrm":

1061

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

1061

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

1062

errors += 1

1062

errors += 1

1063

if errors:

1063

if errors:

1064

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

1064

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

1065

raise util.Abort(error)

1065

raise util.Abort(error)

1066

1067

def debugconfig(ui, repo):

1067

def debugconfig(ui, repo):

1068

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

1068

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

1069

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

1069

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

1070

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

1070

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

1071

1072

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

1072

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

1073

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

1073

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

1074

1075

This is useful for writing repository conversion tools, but should

1075

This is useful for writing repository conversion tools, but should

1076

be used with care.

1076

be used with care.

1077

"""

1077

"""

1078

1079

if not rev2:

1079

if not rev2:

1080

rev2 = hex(nullid)

1080

rev2 = hex(nullid)

1081

1082

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

1082

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

1083

1084

def debugstate(ui, repo):

1084

def debugstate(ui, repo):

1085

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

1085

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

1086

repo.dirstate.read()

1086

repo.dirstate.read()

1087

dc = repo.dirstate.map

1087

dc = repo.dirstate.map

1088

keys = dc.keys()

1088

keys = dc.keys()

1089

keys.sort()

1089

keys.sort()

1090

for file_ in keys:

1090

for file_ in keys:

1091

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

1091

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

1092

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

1092

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

1093

time.strftime("%x %X",

1093

time.strftime("%x %X",

1094

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

1094

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

1095

for f in repo.dirstate.copies:

1095

for f in repo.dirstate.copies:

1096

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

1096

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

1097

1098

def debugdata(ui, file_, rev):

1098

def debugdata(ui, file_, rev):

1099

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

1099

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

1100

r = revlog.revlog(util.opener(os.getcwd(), audit=False),

1100

r = revlog.revlog(util.opener(os.getcwd(), audit=False),

1101

file_[:-2] + ".i", file_)

1101

file_[:-2] + ".i", file_)

1102

try:

1102

try:

1103

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

1103

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

1104

except KeyError:

1104

except KeyError:

1105

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

1105

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

1106

1107

def debugindex(ui, file_):

1107

def debugindex(ui, file_):

1108

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

1108

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

1109

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

1109

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

1110

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

1110

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

1111

" nodeid p1 p2\n")

1111

" nodeid p1 p2\n")

1112

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

1112

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

1113

e = r.index[i]

1113

e = r.index[i]

1114

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

1114

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

1115

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

1115

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

1116

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

1116

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

1117

1118

def debugindexdot(ui, file_):

1118

def debugindexdot(ui, file_):

1119

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

1119

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

1120

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

1120

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

1121

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

1121

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

1122

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

1122

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

1123

e = r.index[i]

1123

e = r.index[i]

1124

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

1124

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

1125

if e[5] != nullid:

1125

if e[5] != nullid:

1126

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

1126

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

1127

ui.write("}\n")

1127

ui.write("}\n")

1128

1129

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

1129

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

1130

"""dump rename information"""

1130

"""dump rename information"""

1131

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

1131

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

1132

if rev:

1132

if rev:

1133

try:

1133

try:

1134

# assume all revision numbers are for changesets

1134

# assume all revision numbers are for changesets

1135

n = repo.lookup(rev)

1135

n = repo.lookup(rev)

1136

change = repo.changelog.read(n)

1136

change = repo.changelog.read(n)

1137

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

1137

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

1138

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

1138

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

1139

except (hg.RepoError, KeyError):

1139

except (hg.RepoError, KeyError):

1140

n = r.lookup(rev)

1140

n = r.lookup(rev)

1141

else:

1141

else:

1142

n = r.tip()

1142

n = r.tip()

1143

m = r.renamed(n)

1143

m = r.renamed(n)

1144

if m:

1144

if m:

1145

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

1145

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

1146

else:

1146

else:

1147

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

1147

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

1148

1149

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

1149

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

1150

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

1150

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

1151

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

1151

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

1152

if not items:

1152

if not items:

1153

return

1153

return

1154

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

1154

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

1155

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

1155

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

1156

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

1156

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

1157

for src, abs, rel, exact in items:

1157

for src, abs, rel, exact in items:

1158

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

1158

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

1159

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

1159

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

1160

1161

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

1161

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

1162

"""diff repository (or selected files)

1162

"""diff repository (or selected files)

1163

1164

Show differences between revisions for the specified files.

1164

Show differences between revisions for the specified files.

1165

1166

Differences between files are shown using the unified diff format.

1166

Differences between files are shown using the unified diff format.

1167

1168

When two revision arguments are given, then changes are shown

1168

When two revision arguments are given, then changes are shown

1169

between those revisions. If only one revision is specified then

1169

between those revisions. If only one revision is specified then

1170

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

1170

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

1171

revisions are specified, the working directory files are compared

1171

revisions are specified, the working directory files are compared

1172

to its parent.

1172

to its parent.

1173

1174

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

1174

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

1175

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

1175

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

1176

probably with undesirable results.

1176

probably with undesirable results.

1177

"""

1177

"""

1178

node1, node2 = None, None

1178

node1, node2 = None, None

1179

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

1179

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

1180

1181

if len(revs) > 0:

1181

if len(revs) > 0:

1182

node1 = revs[0]

1182

node1 = revs[0]

1183

if len(revs) > 1:

1183

if len(revs) > 1:

1184

node2 = revs[1]

1184

node2 = revs[1]

1185

if len(revs) > 2:

1185

if len(revs) > 2:

1186

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

1186

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

1187

1188

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

1188

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

1189

1190

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

1190

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

1191

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

1191

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

1192

1193

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

1193

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

1194

node = repo.lookup(changeset)

1194

node = repo.lookup(changeset)

1195

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

1195

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

1196

if opts['switch_parent']:

1196

if opts['switch_parent']:

1197

parents.reverse()

1197

parents.reverse()

1198

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

1198

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

1199

change = repo.changelog.read(node)

1199

change = repo.changelog.read(node)

1200

1201

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

1201

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

1202

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

1202

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

1203

revwidth=revwidth)

1203

revwidth=revwidth)

1204

if fp != sys.stdout:

1204

if fp != sys.stdout:

1205

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

1205

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

1206

1207

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

1207

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

1208

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

1208

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

1209

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

1209

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

1210

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

1210

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

1211

if len(parents) > 1:

1211

if len(parents) > 1:

1212

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

1212

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

1213

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

1213

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

1214

fp.write("\n\n")

1214

fp.write("\n\n")

1215

1216

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

1216

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

1217

if fp != sys.stdout:

1217

if fp != sys.stdout:

1218

fp.close()

1218

fp.close()

1219

1220

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

1220

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

1221

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

1221

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

1222

1223

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

1223

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

1224

1225

The information shown in the changeset header is: author,

1225

The information shown in the changeset header is: author,

1226

changeset hash, parent and commit comment.

1226

changeset hash, parent and commit comment.

1227

1228

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

1228

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

1229

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

1229

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

1230

1231

%% literal "%" character

1231

%% literal "%" character

1232

%H changeset hash (40 bytes of hexadecimal)

1232

%H changeset hash (40 bytes of hexadecimal)

1233

%N number of patches being generated

1233

%N number of patches being generated

1234

%R changeset revision number

1234

%R changeset revision number

1235

%b basename of the exporting repository

1235

%b basename of the exporting repository

1236

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

1236

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

1237

%n zero-padded sequence number, starting at 1

1237

%n zero-padded sequence number, starting at 1

1238

%r zero-padded changeset revision number

1238

%r zero-padded changeset revision number

1239

1240

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

1240

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

1241

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

1241

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

1242

probably with undesirable results.

1242

probably with undesirable results.

1243

1244

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

1244

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

1245

parent. It can be useful to review a merge.

1245

parent. It can be useful to review a merge.

1246

"""

1246

"""

1247

if not changesets:

1247

if not changesets:

1248

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

1248

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

1249

seqno = 0

1249

seqno = 0

1250

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

1250

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

1251

total = len(revs)

1251

total = len(revs)

1252

revwidth = max(map(len, revs))

1252

revwidth = max(map(len, revs))

1253

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

1253

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

1254

ui.note(msg)

1254

ui.note(msg)

1255

for cset in revs:

1255

for cset in revs:

1256

seqno += 1

1256

seqno += 1

1257

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

1257

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

1258

1259

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

1259

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

1260

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

1260

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

1261

1262

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

1262

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

1263

"""

1263

"""

1264

forget = []

1264

forget = []

1265

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

1265

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

1266

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

1266

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

1267

forget.append(abs)

1267

forget.append(abs)

1268

if ui.verbose or not exact:

1268

if ui.verbose or not exact:

1269

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

1269

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

1270

repo.forget(forget)

1270

repo.forget(forget)

1271

1272

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

1272

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

1273

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

1273

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

1274

1275

Search revisions of files for a regular expression.

1275

Search revisions of files for a regular expression.

1276

1277

This command behaves differently than Unix grep. It only accepts

1277

This command behaves differently than Unix grep. It only accepts

1278

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

1278

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

1279

working directory. It always prints the revision number in which

1279

working directory. It always prints the revision number in which

1280

a match appears.

1280

a match appears.

1281

1282

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

1282

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

1283

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

1283

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

1284

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

1284

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

1285

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

1285

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

1286

use the --all flag.

1286

use the --all flag.

1287

"""

1287

"""

1288

reflags = 0

1288

reflags = 0

1289

if opts['ignore_case']:

1289

if opts['ignore_case']:

1290

reflags |= re.I

1290

reflags |= re.I

1291

regexp = re.compile(pattern, reflags)

1291

regexp = re.compile(pattern, reflags)

1292

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

1292

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

1293

if opts['print0']:

1293

if opts['print0']:

1294

sep = eol = '\0'

1294

sep = eol = '\0'

1295

1296

fcache = {}

1296

fcache = {}

1297

def getfile(fn):

1297

def getfile(fn):

1298

if fn not in fcache:

1298

if fn not in fcache:

1299

fcache[fn] = repo.file(fn)

1299

fcache[fn] = repo.file(fn)

1300

return fcache[fn]

1300

return fcache[fn]

1301

1302

def matchlines(body):

1302

def matchlines(body):

1303

begin = 0

1303

begin = 0

1304

linenum = 0

1304

linenum = 0

1305

while True:

1305

while True:

1306

match = regexp.search(body, begin)

1306

match = regexp.search(body, begin)

1307

if not match:

1307

if not match:

1308

break

1308

break

1309

mstart, mend = match.span()

1309

mstart, mend = match.span()

1310

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

1310

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

1311

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

1311

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

1312

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

1312

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

1313

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

1313

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

1314

begin = lend + 1

1314

begin = lend + 1

1315

1316

class linestate(object):

1316

class linestate(object):

1317

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

1317

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

1318

self.line = line

1318

self.line = line

1319

self.linenum = linenum

1319

self.linenum = linenum

1320

self.colstart = colstart

1320

self.colstart = colstart

1321

self.colend = colend

1321

self.colend = colend

1322

def __eq__(self, other):

1322

def __eq__(self, other):

1323

return self.line == other.line

1323

return self.line == other.line

1324

def __hash__(self):

1324

def __hash__(self):

1325

return hash(self.line)

1325

return hash(self.line)

1326

1327

matches = {}

1327

matches = {}

1328

def grepbody(fn, rev, body):

1328

def grepbody(fn, rev, body):

1329

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

1329

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

1330

m = matches[rev][fn]

1330

m = matches[rev][fn]

1331

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

1331

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

1332

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

1332

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

1333

m[s] = s

1333

m[s] = s

1334

1335

# FIXME: prev isn't used, why ?

1335

# FIXME: prev isn't used, why ?

1336

prev = {}

1336

prev = {}

1337

ucache = {}

1337

ucache = {}

1338

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

1338

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

1339

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

1339

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

1340

diff.sort(lambda x, y: cmp(x.linenum, y.linenum))

1340

diff.sort(lambda x, y: cmp(x.linenum, y.linenum))

1341

counts = {'-': 0, '+': 0}

1341

counts = {'-': 0, '+': 0}

1342

filerevmatches = {}

1342

filerevmatches = {}

1343

for l in diff:

1343

for l in diff:

1344

if incrementing or not opts['all']:

1344

if incrementing or not opts['all']:

1345

change = ((l in prevstates) and '-') or '+'

1345

change = ((l in prevstates) and '-') or '+'

1346

r = rev

1346

r = rev

1347

else:

1347

else:

1348

change = ((l in states) and '-') or '+'

1348

change = ((l in states) and '-') or '+'

1349

r = prev[fn]

1349

r = prev[fn]

1350

cols = [fn, str(rev)]

1350

cols = [fn, str(rev)]

1351

if opts['line_number']:

1351

if opts['line_number']:

1352

cols.append(str(l.linenum))

1352

cols.append(str(l.linenum))

1353

if opts['all']:

1353

if opts['all']:

1354

cols.append(change)

1354

cols.append(change)

1355

if opts['user']:

1355

if opts['user']:

1356

cols.append(trimuser(ui, getchange(rev)[1], rev,

1356

cols.append(trimuser(ui, getchange(rev)[1], rev,

1357

ucache))

1357

ucache))

1358

if opts['files_with_matches']:

1358

if opts['files_with_matches']:

1359

c = (fn, rev)

1359

c = (fn, rev)

1360

if c in filerevmatches:

1360

if c in filerevmatches:

1361

continue

1361

continue

1362

filerevmatches[c] = 1

1362

filerevmatches[c] = 1

1363

else:

1363

else:

1364

cols.append(l.line)

1364

cols.append(l.line)

1365

ui.write(sep.join(cols), eol)

1365

ui.write(sep.join(cols), eol)

1366

counts[change] += 1

1366

counts[change] += 1

1367

return counts['+'], counts['-']

1367

return counts['+'], counts['-']

1368

1369

fstate = {}

1369

fstate = {}

1370

skip = {}

1370

skip = {}

1371

changeiter, getchange, matchfn = walkchangerevs(ui, repo, pats, opts)

1371

changeiter, getchange, matchfn = walkchangerevs(ui, repo, pats, opts)

1372

count = 0

1372

count = 0

1373

incrementing = False

1373

incrementing = False

1374

for st, rev, fns in changeiter:

1374

for st, rev, fns in changeiter:

1375

if st == 'window':

1375

if st == 'window':

1376

incrementing = rev

1376

incrementing = rev

1377

matches.clear()

1377

matches.clear()

1378

elif st == 'add':

1378

elif st == 'add':

1379

change = repo.changelog.read(repo.lookup(str(rev)))

1379

change = repo.changelog.read(repo.lookup(str(rev)))

1380

mf = repo.manifest.read(change[0])

1380

mf = repo.manifest.read(change[0])

1381

matches[rev] = {}

1381

matches[rev] = {}

1382

for fn in fns:

1382

for fn in fns:

1383

if fn in skip:

1383

if fn in skip:

1384

continue

1384

continue

1385

fstate.setdefault(fn, {})

1385

fstate.setdefault(fn, {})

1386

try:

1386

try:

1387

grepbody(fn, rev, getfile(fn).read(mf[fn]))

1387

grepbody(fn, rev, getfile(fn).read(mf[fn]))

1388

except KeyError:

1388

except KeyError:

1389

pass

1389

pass

1390

elif st == 'iter':

1390

elif st == 'iter':

1391

states = matches[rev].items()

1391

states = matches[rev].items()

1392

states.sort()

1392

states.sort()

1393

for fn, m in states:

1393

for fn, m in states:

1394

if fn in skip:

1394

if fn in skip:

1395

continue

1395

continue

1396

if incrementing or not opts['all'] or fstate[fn]:

1396

if incrementing or not opts['all'] or fstate[fn]:

1397

pos, neg = display(fn, rev, m, fstate[fn])

1397

pos, neg = display(fn, rev, m, fstate[fn])

1398

count += pos + neg

1398

count += pos + neg

1399

if pos and not opts['all']:

1399

if pos and not opts['all']:

1400

skip[fn] = True

1400

skip[fn] = True

1401

fstate[fn] = m

1401

fstate[fn] = m

1402

prev[fn] = rev

1402

prev[fn] = rev

1403

1404

if not incrementing:

1404

if not incrementing:

1405

fstate = fstate.items()

1405

fstate = fstate.items()

1406

fstate.sort()

1406

fstate.sort()

1407

for fn, state in fstate:

1407

for fn, state in fstate:

1408

if fn in skip:

1408

if fn in skip:

1409

continue

1409

continue

1410

display(fn, rev, {}, state)

1410

display(fn, rev, {}, state)

1411

return (count == 0 and 1) or 0

1411

return (count == 0 and 1) or 0

1412

1413

def heads(ui, repo, **opts):

1413

def heads(ui, repo, **opts):

1414

"""show current repository heads

1414

"""show current repository heads

1415

1416

Show all repository head changesets.

1416

Show all repository head changesets.

1417

1418

Repository "heads" are changesets that don't have children

1418

Repository "heads" are changesets that don't have children

1419

changesets. They are where development generally takes place and

1419

changesets. They are where development generally takes place and

1420

are the usual targets for update and merge operations.

1420

are the usual targets for update and merge operations.

1421

"""

1421

"""

1422

if opts['rev']:

1422

if opts['rev']:

1423

heads = repo.heads(repo.lookup(opts['rev']))

1423

heads = repo.heads(repo.lookup(opts['rev']))

1424

else:

1424

else:

1425

heads = repo.heads()

1425

heads = repo.heads()

1426

br = None

1426

br = None

1427

if opts['branches']:

1427

if opts['branches']:

1428

br = repo.branchlookup(heads)

1428

br = repo.branchlookup(heads)

1429

for n in heads:

1429

for n in heads:

1430

show_changeset(ui, repo, changenode=n, brinfo=br)

1430

show_changeset(ui, repo, changenode=n, brinfo=br)

1431

1432

def identify(ui, repo):

1432

def identify(ui, repo):

1433

"""print information about the working copy

1433

"""print information about the working copy

1434

1435

Print a short summary of the current state of the repo.

1435

Print a short summary of the current state of the repo.

1436

1437

This summary identifies the repository state using one or two parent

1437

This summary identifies the repository state using one or two parent

1438

hash identifiers, followed by a "+" if there are uncommitted changes

1438

hash identifiers, followed by a "+" if there are uncommitted changes

1439

in the working directory, followed by a list of tags for this revision.

1439

in the working directory, followed by a list of tags for this revision.

1440

"""

1440

"""

1441

parents = [p for p in repo.dirstate.parents() if p != nullid]

1441

parents = [p for p in repo.dirstate.parents() if p != nullid]

1442

if not parents:

1442

if not parents:

1443

ui.write(_("unknown\n"))

1443

ui.write(_("unknown\n"))

1444

return

1444

return

1445

1446

hexfunc = ui.verbose and hex or short

1446

hexfunc = ui.verbose and hex or short

1447

modified, added, removed, deleted, unknown = repo.changes()

1447

modified, added, removed, deleted, unknown = repo.changes()

1448

output = ["%s%s" %

1448

output = ["%s%s" %

1449

('+'.join([hexfunc(parent) for parent in parents]),

1449

('+'.join([hexfunc(parent) for parent in parents]),

1450

(modified or added or removed or deleted) and "+" or "")]

1450

(modified or added or removed or deleted) and "+" or "")]

1451

1452

if not ui.quiet:

1452

if not ui.quiet:

1453

# multiple tags for a single parent separated by '/'

1453

# multiple tags for a single parent separated by '/'

1454

parenttags = ['/'.join(tags)

1454

parenttags = ['/'.join(tags)

1455

for tags in map(repo.nodetags, parents) if tags]

1455

for tags in map(repo.nodetags, parents) if tags]

1456

# tags for multiple parents separated by ' + '

1456

# tags for multiple parents separated by ' + '

1457

if parenttags:

1457

if parenttags:

1458

output.append(' + '.join(parenttags))

1458

output.append(' + '.join(parenttags))

1459

1460

ui.write("%s\n" % ' '.join(output))

1460

ui.write("%s\n" % ' '.join(output))

1461

1462

def import_(ui, repo, patch1, *patches, **opts):

1462

def import_(ui, repo, patch1, *patches, **opts):

1463

"""import an ordered set of patches

1463

"""import an ordered set of patches

1464

1465

Import a list of patches and commit them individually.

1465

Import a list of patches and commit them individually.

1466

1467

If there are outstanding changes in the working directory, import

1467

If there are outstanding changes in the working directory, import

1468

will abort unless given the -f flag.

1468

will abort unless given the -f flag.

1469

1470

If a patch looks like a mail message (its first line starts with

1470

If a patch looks like a mail message (its first line starts with

1471

"From " or looks like an RFC822 header), it will not be applied

1471

"From " or looks like an RFC822 header), it will not be applied

1472

unless the -f option is used. The importer neither parses nor

1472

unless the -f option is used. The importer neither parses nor

1473

discards mail headers, so use -f only to override the "mailness"

1473

discards mail headers, so use -f only to override the "mailness"

1474

safety check, not to import a real mail message.

1474

safety check, not to import a real mail message.

1475

"""

1475

"""

1476

patches = (patch1,) + patches

1476

patches = (patch1,) + patches

1477

1478

if not opts['force']:

1478

if not opts['force']:

1479

modified, added, removed, deleted, unknown = repo.changes()

1479

modified, added, removed, deleted, unknown = repo.changes()

1480

if modified or added or removed or deleted:

1480

if modified or added or removed or deleted:

1481

raise util.Abort(_("outstanding uncommitted changes"))

1481

raise util.Abort(_("outstanding uncommitted changes"))

1482

1483

d = opts["base"]

1483

d = opts["base"]

1484

strip = opts["strip"]

1484

strip = opts["strip"]

1485

1486

mailre = re.compile(r'(?:From |[\w-]+:)')

1486

mailre = re.compile(r'(?:From |[\w-]+:)')

1487

1488

# attempt to detect the start of a patch

1488

# attempt to detect the start of a patch

1489

# (this heuristic is borrowed from quilt)

1489

# (this heuristic is borrowed from quilt)

1490

diffre = re.compile(r'(?:Index:[ \t]|diff[ \t]|RCS file: |' +

1490

diffre = re.compile(r'(?:Index:[ \t]|diff[ \t]|RCS file: |' +

1491

'retrieving revision [0-9]+(\.[0-9]+)*$|' +

1491

'retrieving revision [0-9]+(\.[0-9]+)*$|' +

1492

'(---|\*\*\*)[ \t])')

1492

'(---|\*\*\*)[ \t])')

1493

1494

for patch in patches:

1494

for patch in patches:

1495

ui.status(_("applying %s\n") % patch)

1495

ui.status(_("applying %s\n") % patch)

1496

pf = os.path.join(d, patch)

1496

pf = os.path.join(d, patch)

1497

1498

message = []

1498

message = []

1499

user = None

1499

user = None

1500

hgpatch = False

1500

hgpatch = False

1501

for line in file(pf):

1501

for line in file(pf):

1502

line = line.rstrip()

1502

line = line.rstrip()

1503

if (not message and not hgpatch and

1503

if (not message and not hgpatch and

1504

mailre.match(line) and not opts['force']):

1504

mailre.match(line) and not opts['force']):

1505

if len(line) > 35:

1505

if len(line) > 35:

1506

line = line[:32] + '...'

1506

line = line[:32] + '...'

1507

raise util.Abort(_('first line looks like a '

1507

raise util.Abort(_('first line looks like a '

1508

'mail header: ') + line)

1508

'mail header: ') + line)

1509

if diffre.match(line):

1509

if diffre.match(line):

1510

break

1510

break

1511

elif hgpatch:

1511

elif hgpatch:

1512

# parse values when importing the result of an hg export

1512

# parse values when importing the result of an hg export

1513

if line.startswith("# User "):

1513

if line.startswith("# User "):

1514

user = line[7:]

1514

user = line[7:]

1515

ui.debug(_('User: %s\n') % user)

1515

ui.debug(_('User: %s\n') % user)

1516

elif not line.startswith("# ") and line:

1516

elif not line.startswith("# ") and line:

1517

message.append(line)

1517

message.append(line)

1518

hgpatch = False

1518

hgpatch = False

1519

elif line == '# HG changeset patch':

1519

elif line == '# HG changeset patch':

1520

hgpatch = True

1520

hgpatch = True

1521

message = [] # We may have collected garbage

1521

message = [] # We may have collected garbage

1522

else:

1522

else:

1523

message.append(line)

1523

message.append(line)

1524

1525

# make sure message isn't empty

1525

# make sure message isn't empty

1526

if not message:

1526

if not message:

1527

message = _("imported patch %s\n") % patch

1527

message = _("imported patch %s\n") % patch

1528

else:

1528

else:

1529

message = "%s\n" % '\n'.join(message)

1529

message = "%s\n" % '\n'.join(message)

1530

ui.debug(_('message:\n%s\n') % message)

1530

ui.debug(_('message:\n%s\n') % message)

1531

1532

files = util.patch(strip, pf, ui)

1532

files = util.patch(strip, pf, ui)

1533

1534

if len(files) > 0:

1534

if len(files) > 0:

1535

addremove(ui, repo, *files)

1535

addremove(ui, repo, *files)

1536

repo.commit(files, message, user)

1536

repo.commit(files, message, user)

1537

1538

def incoming(ui, repo, source="default", **opts):

1538

def incoming(ui, repo, source="default", **opts):

1539

"""show new changesets found in source

1539

"""show new changesets found in source

1540

1541

Show new changesets found in the specified repo or the default

1541

Show new changesets found in the specified repo or the default

1542

pull repo. These are the changesets that would be pulled if a pull

1542

pull repo. These are the changesets that would be pulled if a pull

1543

was requested.

1543

was requested.

1544

1545

Currently only local repositories are supported.

1545

Currently only local repositories are supported.

1546

"""

1546

"""

1547

source = ui.expandpath(source, repo.root)

1547

source = ui.expandpath(source, repo.root)

1548

other = hg.repository(ui, source)

1548

other = hg.repository(ui, source)

1549

if not other.local():

1549

if not other.local():

1550

raise util.Abort(_("incoming doesn't work for remote repositories yet"))

1550

raise util.Abort(_("incoming doesn't work for remote repositories yet"))

1551

o = repo.findincoming(other)

1551

o = repo.findincoming(other)

1552

if not o:

1552

if not o:

1553

return

1553

return

1554

o = other.changelog.nodesbetween(o)[0]

1554

o = other.changelog.nodesbetween(o)[0]

1555

if opts['newest_first']:

1555

if opts['newest_first']:

1556

o.reverse()

1556

o.reverse()

1557

for n in o:

1557

for n in o:

1558

parents = [p for p in other.changelog.parents(n) if p != nullid]

1558

parents = [p for p in other.changelog.parents(n) if p != nullid]

1559

if opts['no_merges'] and len(parents) == 2:

1559

if opts['no_merges'] and len(parents) == 2:

1560

continue

1560

continue

1561

show_changeset(ui, other, changenode=n)

1561

show_changeset(ui, other, changenode=n)

1562

if opts['patch']:

1562

if opts['patch']:

1563

prev = (parents and parents[0]) or nullid

1563

prev = (parents and parents[0]) or nullid

1564

dodiff(ui, ui, other, prev, n)

1564

dodiff(ui, ui, other, prev, n)

1565

ui.write("\n")

1565

ui.write("\n")

1566

1567

def init(ui, dest="."):

1567

def init(ui, dest="."):

1568

"""create a new repository in the given directory

1568

"""create a new repository in the given directory

1569

1570

Initialize a new repository in the given directory. If the given

1570

Initialize a new repository in the given directory. If the given

1571

directory does not exist, it is created.

1571

directory does not exist, it is created.

1572

1573

If no directory is given, the current directory is used.

1573

If no directory is given, the current directory is used.

1574

"""

1574

"""

1575

if not os.path.exists(dest):

1575

if not os.path.exists(dest):

1576

os.mkdir(dest)

1576

os.mkdir(dest)

1577

hg.repository(ui, dest, create=1)

1577

hg.repository(ui, dest, create=1)

1578

1579

def locate(ui, repo, *pats, **opts):

1579

def locate(ui, repo, *pats, **opts):

1580

"""locate files matching specific patterns

1580

"""locate files matching specific patterns

1581

1582

Print all files under Mercurial control whose names match the

1582

Print all files under Mercurial control whose names match the

1583

given patterns.

1583

given patterns.

1584

1585

This command searches the current directory and its

1585

This command searches the current directory and its

1586

subdirectories. To search an entire repository, move to the root

1586

subdirectories. To search an entire repository, move to the root

1587

of the repository.

1587

of the repository.

1588

1589

If no patterns are given to match, this command prints all file

1589

If no patterns are given to match, this command prints all file

1590

names.

1590

names.

1591

1592

If you want to feed the output of this command into the "xargs"

1592

If you want to feed the output of this command into the "xargs"

1593

command, use the "-0" option to both this command and "xargs".

1593

command, use the "-0" option to both this command and "xargs".

1594

This will avoid the problem of "xargs" treating single filenames

1594

This will avoid the problem of "xargs" treating single filenames

1595

that contain white space as multiple filenames.

1595

that contain white space as multiple filenames.

1596

"""

1596

"""

1597

end = opts['print0'] and '\0' or '\n'

1597

end = opts['print0'] and '\0' or '\n'

1598

rev = opts['rev']

1598

rev = opts['rev']

1599

if rev:

1599

if rev:

1600

node = repo.lookup(rev)

1600

node = repo.lookup(rev)

1601

else:

1601

else:

1602

node = None

1602

node = None

1603

1604

for src, abs, rel, exact in walk(repo, pats, opts, node=node,

1604

for src, abs, rel, exact in walk(repo, pats, opts, node=node,

1605

head='(?:.*/|)'):

1605

head='(?:.*/|)'):

1606

if not node and repo.dirstate.state(abs) == '?':

1606

if not node and repo.dirstate.state(abs) == '?':

1607

continue

1607

continue

1608

if opts['fullpath']:

1608

if opts['fullpath']:

1609

ui.write(os.path.join(repo.root, abs), end)

1609

ui.write(os.path.join(repo.root, abs), end)

1610

else:

1610

else:

1611

ui.write(((pats and rel) or abs), end)

1611

ui.write(((pats and rel) or abs), end)

1612

1613

def log(ui, repo, *pats, **opts):

1613

def log(ui, repo, *pats, **opts):

1614

"""show revision history of entire repository or files

1614

"""show revision history of entire repository or files

1615

1616

Print the revision history of the specified files or the entire project.

1616

Print the revision history of the specified files or the entire project.

1617

1618

By default this command outputs: changeset id and hash, tags,

1618

By default this command outputs: changeset id and hash, tags,

1619

non-trivial parents, user, date and time, and a summary for each

1619

non-trivial parents, user, date and time, and a summary for each

1620

commit. When the -v/--verbose switch is used, the list of changed

1620

commit. When the -v/--verbose switch is used, the list of changed

1621

files and full commit message is shown.

1621

files and full commit message is shown.

1622

"""

1622

"""

1623

class dui(object):

1623

class dui(object):

1624

# Implement and delegate some ui protocol. Save hunks of

1624

# Implement and delegate some ui protocol. Save hunks of

1625

# output for later display in the desired order.

1625

# output for later display in the desired order.

1626

def __init__(self, ui):

1626

def __init__(self, ui):

1627

self.ui = ui

1627

self.ui = ui

1628

self.hunk = {}

1628

self.hunk = {}

1629

def bump(self, rev):

1629

def bump(self, rev):

1630

self.rev = rev

1630

self.rev = rev

1631

self.hunk[rev] = []

1631

self.hunk[rev] = []

1632

def note(self, *args):

1632

def note(self, *args):

1633

if self.verbose:

1633

if self.verbose:

1634

self.write(*args)

1634

self.write(*args)

1635

def status(self, *args):

1635

def status(self, *args):

1636

if not self.quiet:

1636

if not self.quiet:

1637

self.write(*args)

1637

self.write(*args)

1638

def write(self, *args):

1638

def write(self, *args):

1639

self.hunk[self.rev].append(args)

1639

self.hunk[self.rev].append(args)

1640

def debug(self, *args):

1640

def debug(self, *args):

1641

if self.debugflag:

1641

if self.debugflag:

1642

self.write(*args)

1642

self.write(*args)

1643

def __getattr__(self, key):

1643

def __getattr__(self, key):

1644

return getattr(self.ui, key)

1644

return getattr(self.ui, key)

1645

1646

changeiter, getchange, matchfn = walkchangerevs(ui, repo, pats, opts)

1646

changeiter, getchange, matchfn = walkchangerevs(ui, repo, pats, opts)

1647

1648

if opts['limit']:

1648

if opts['limit']:

1649

try:

1649

try:

1650

limit = int(opts['limit'])

1650

limit = int(opts['limit'])

1651

except ValueError:

1651

except ValueError:

1652

raise util.Abort(_('limit must be a positive integer'))

1652

raise util.Abort(_('limit must be a positive integer'))

1653

if limit <= 0: raise util.Abort(_('limit must be positive'))

1653

if limit <= 0: raise util.Abort(_('limit must be positive'))

1654

else:

1654

else:

1655

limit = sys.maxint

1655

limit = sys.maxint

1656

count = 0

1656

count = 0

1657

1658

for st, rev, fns in changeiter:

1658

for st, rev, fns in changeiter:

1659

if st == 'window':

1659

if st == 'window':

1660

du = dui(ui)

1660

du = dui(ui)

1661

elif st == 'add':

1661

elif st == 'add':

1662

du.bump(rev)

1662

du.bump(rev)

1663

changenode = repo.changelog.node(rev)

1663

changenode = repo.changelog.node(rev)

1664

parents = [p for p in repo.changelog.parents(changenode)

1664

parents = [p for p in repo.changelog.parents(changenode)

1665

if p != nullid]

1665

if p != nullid]

1666

if opts['no_merges'] and len(parents) == 2:

1666

if opts['no_merges'] and len(parents) == 2:

1667

continue

1667

continue

1668

if opts['only_merges'] and len(parents) != 2:

1668

if opts['only_merges'] and len(parents) != 2:

1669

continue

1669

continue

1670

1671

if opts['keyword']:

1671

if opts['keyword']:

1672

changes = getchange(rev)

1672

changes = getchange(rev)

1673

miss = 0

1673

miss = 0

1674

for k in [kw.lower() for kw in opts['keyword']]:

1674

for k in [kw.lower() for kw in opts['keyword']]:

1675

if not (k in changes[1].lower() or

1675

if not (k in changes[1].lower() or

1676

k in changes[4].lower() or

1676

k in changes[4].lower() or

1677

k in " ".join(changes[3][:20]).lower()):

1677

k in " ".join(changes[3][:20]).lower()):

1678

miss = 1

1678

miss = 1

1679

break

1679

break

1680

if miss:

1680

if miss:

1681

continue

1681

continue

1682

1683

br = None

1683

br = None

1684

if opts['branches']:

1684

if opts['branches']:

1685

br = repo.branchlookup([repo.changelog.node(rev)])

1685

br = repo.branchlookup([repo.changelog.node(rev)])

1686

1687

show_changeset(du, repo, rev, brinfo=br)

1687

show_changeset(du, repo, rev, brinfo=br)

1688

if opts['patch']:

1688

if opts['patch']:

1689

prev = (parents and parents[0]) or nullid

1689

prev = (parents and parents[0]) or nullid

1690

dodiff(du, du, repo, prev, changenode, match=matchfn)

1690

dodiff(du, du, repo, prev, changenode, match=matchfn)

1691

du.write("\n\n")

1691

du.write("\n\n")

1692

elif st == 'iter':

1692

elif st == 'iter':

1693

if count == limit: break

1693

if count == limit: break

1694

if du.hunk[rev]:

1694

if du.hunk[rev]:

1695

count += 1

1695

count += 1

1696

for args in du.hunk[rev]:

1696

for args in du.hunk[rev]:

1697

ui.write(*args)

1697

ui.write(*args)

1698

1699

def manifest(ui, repo, rev=None):

1699

def manifest(ui, repo, rev=None):

1700

"""output the latest or given revision of the project manifest

1700

"""output the latest or given revision of the project manifest

1701

1702

Print a list of version controlled files for the given revision.

1702

Print a list of version controlled files for the given revision.

1703

1704

The manifest is the list of files being version controlled. If no revision

1704

The manifest is the list of files being version controlled. If no revision

1705

is given then the tip is used.

1705

is given then the tip is used.

1706

"""

1706

"""

1707

if rev:

1707

if rev:

1708

try:

1708

try:

1709

# assume all revision numbers are for changesets

1709

# assume all revision numbers are for changesets

1710

n = repo.lookup(rev)

1710

n = repo.lookup(rev)

1711

change = repo.changelog.read(n)

1711

change = repo.changelog.read(n)

1712

n = change[0]

1712

n = change[0]

1713

except hg.RepoError:

1713

except hg.RepoError:

1714

n = repo.manifest.lookup(rev)

1714

n = repo.manifest.lookup(rev)

1715

else:

1715

else:

1716

n = repo.manifest.tip()

1716

n = repo.manifest.tip()

1717

m = repo.manifest.read(n)

1717

m = repo.manifest.read(n)

1718

mf = repo.manifest.readflags(n)

1718

mf = repo.manifest.readflags(n)

1719

files = m.keys()

1719

files = m.keys()

1720

files.sort()

1720

files.sort()

1721

1722

for f in files:

1722

for f in files:

1723

ui.write("%40s %3s %s\n" % (hex(m[f]), mf[f] and "755" or "644", f))

1723

ui.write("%40s %3s %s\n" % (hex(m[f]), mf[f] and "755" or "644", f))

1724

1725

def outgoing(ui, repo, dest="default-push", **opts):

1725

def outgoing(ui, repo, dest="default-push", **opts):

1726

"""show changesets not found in destination

1726

"""show changesets not found in destination

1727

1728

Show changesets not found in the specified destination repo or the

1728

Show changesets not found in the specified destination repo or the

1729

default push repo. These are the changesets that would be pushed

1729

default push repo. These are the changesets that would be pushed

1730

if a push was requested.

1730

if a push was requested.

1731

1732

See pull for valid source format details.

1732

See pull for valid source format details.

1733

"""

1733

"""

1734

dest = ui.expandpath(dest, repo.root)

1734

dest = ui.expandpath(dest, repo.root)

1735

other = hg.repository(ui, dest)

1735

other = hg.repository(ui, dest)

1736

o = repo.findoutgoing(other)

1736

o = repo.findoutgoing(other)

1737

o = repo.changelog.nodesbetween(o)[0]

1737

o = repo.changelog.nodesbetween(o)[0]

1738

if opts['newest_first']:

1738

if opts['newest_first']:

1739

o.reverse()

1739

o.reverse()

1740

for n in o:

1740

for n in o:

1741

parents = [p for p in repo.changelog.parents(n) if p != nullid]

1741

parents = [p for p in repo.changelog.parents(n) if p != nullid]

1742

if opts['no_merges'] and len(parents) == 2:

1742

if opts['no_merges'] and len(parents) == 2:

1743

continue

1743

continue

1744

show_changeset(ui, repo, changenode=n)

1744

show_changeset(ui, repo, changenode=n)

1745

if opts['patch']:

1745

if opts['patch']:

1746

prev = (parents and parents[0]) or nullid

1746

prev = (parents and parents[0]) or nullid

1747

dodiff(ui, ui, repo, prev, n)

1747

dodiff(ui, ui, repo, prev, n)

1748

ui.write("\n")

1748

ui.write("\n")

1749

1750

def parents(ui, repo, rev=None, branches=None):

1750

def parents(ui, repo, rev=None, branches=None):

1751

"""show the parents of the working dir or revision

1751

"""show the parents of the working dir or revision

1752

1753

Print the working directory's parent revisions.

1753

Print the working directory's parent revisions.

1754

"""

1754

"""

1755

if rev:

1755

if rev:

1756

p = repo.changelog.parents(repo.lookup(rev))

1756

p = repo.changelog.parents(repo.lookup(rev))

1757

else:

1757

else:

1758

p = repo.dirstate.parents()

1758

p = repo.dirstate.parents()

1759

1760

br = None

1760

br = None

1761

if branches is not None:

1761

if branches is not None:

1762

br = repo.branchlookup(p)

1762

br = repo.branchlookup(p)

1763

for n in p:

1763

for n in p:

1764

if n != nullid:

1764

if n != nullid:

1765

show_changeset(ui, repo, changenode=n, brinfo=br)

1765

show_changeset(ui, repo, changenode=n, brinfo=br)

1766

1767

def paths(ui, repo, search=None):

1767

def paths(ui, repo, search=None):

1768

"""show definition of symbolic path names

1768

"""show definition of symbolic path names

1769

1770

Show definition of symbolic path name NAME. If no name is given, show

1770

Show definition of symbolic path name NAME. If no name is given, show

1771

definition of available names.

1771

definition of available names.

1772

1773

Path names are defined in the [paths] section of /etc/mercurial/hgrc

1773

Path names are defined in the [paths] section of /etc/mercurial/hgrc

1774

and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.

1774

and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.

1775

"""

1775

"""

1776

if search:

1776

if search:

1777

for name, path in ui.configitems("paths"):

1777

for name, path in ui.configitems("paths"):

1778

if name == search:

1778

if name == search:

1779

ui.write("%s\n" % path)

1779

ui.write("%s\n" % path)

1780

return

1780

return

1781

ui.warn(_("not found!\n"))

1781

ui.warn(_("not found!\n"))

1782

return 1

1782

return 1

1783

else:

1783

else:

1784

for name, path in ui.configitems("paths"):

1784

for name, path in ui.configitems("paths"):

1785

ui.write("%s = %s\n" % (name, path))

1785

ui.write("%s = %s\n" % (name, path))

1786

1787

def pull(ui, repo, source="default", **opts):

1787

def pull(ui, repo, source="default", **opts):

1788

"""pull changes from the specified source

1788

"""pull changes from the specified source

1789

1790

Pull changes from a remote repository to a local one.

1790

Pull changes from a remote repository to a local one.

1791

1792

This finds all changes from the repository at the specified path

1792

This finds all changes from the repository at the specified path

1793

or URL and adds them to the local repository. By default, this

1793

or URL and adds them to the local repository. By default, this

1794

does not update the copy of the project in the working directory.

1794

does not update the copy of the project in the working directory.

1795

1796

Valid URLs are of the form:

1796

Valid URLs are of the form:

1797

1798

local/filesystem/path

1798

local/filesystem/path

1799

http://[user@]host[:port][/path]

1799

http://[user@]host[:port][/path]

1800

https://[user@]host[:port][/path]

1800

https://[user@]host[:port][/path]

1801

ssh://[user@]host[:port][/path]

1801

ssh://[user@]host[:port][/path]

1802

1803

SSH requires an accessible shell account on the destination machine

1803

SSH requires an accessible shell account on the destination machine

1804

and a copy of hg in the remote path. With SSH, paths are relative

1804

and a copy of hg in the remote path. With SSH, paths are relative

1805

to the remote user's home directory by default; use two slashes at

1805

to the remote user's home directory by default; use two slashes at

1806

the start of a path to specify it as relative to the filesystem root.

1806

the start of a path to specify it as relative to the filesystem root.

1807

"""

1807

"""

1808

source = ui.expandpath(source, repo.root)

1808

source = ui.expandpath(source, repo.root)

1809

ui.status(_('pulling from %s\n') % (source))

1809

ui.status(_('pulling from %s\n') % (source))

1810

1811

if opts['ssh']:

1811

if opts['ssh']:

1812

ui.setconfig("ui", "ssh", opts['ssh'])

1812

ui.setconfig("ui", "ssh", opts['ssh'])

1813

if opts['remotecmd']:

1813

if opts['remotecmd']:

1814

ui.setconfig("ui", "remotecmd", opts['remotecmd'])

1814

ui.setconfig("ui", "remotecmd", opts['remotecmd'])

1815

1816

other = hg.repository(ui, source)

1816

other = hg.repository(ui, source)

1817

revs = None

1817

revs = None

1818

if opts['rev'] and not other.local():

1818

if opts['rev'] and not other.local():

1819

raise util.Abort(_("pull -r doesn't work for remote repositories yet"))

1819

raise util.Abort(_("pull -r doesn't work for remote repositories yet"))

1820

elif opts['rev']:

1820

elif opts['rev']:

1821

revs = [other.lookup(rev) for rev in opts['rev']]

1821

revs = [other.lookup(rev) for rev in opts['rev']]

1822

r = repo.pull(other, heads=revs)

1822

r = repo.pull(other, heads=revs)

1823

if not r:

1823

if not r:

1824

if opts['update']:

1824

if opts['update']:

1825

return update(ui, repo)

1825

return update(ui, repo)

1826

else:

1826

else:

1827

ui.status(_("(run 'hg update' to get a working copy)\n"))

1827

ui.status(_("(run 'hg update' to get a working copy)\n"))

1828

1829

return r

1829

return r

1830

1831

def push(ui, repo, dest="default-push", **opts):

1831

def push(ui, repo, dest="default-push", **opts):

1832

"""push changes to the specified destination

1832

"""push changes to the specified destination

1833

1834

Push changes from the local repository to the given destination.

1834

Push changes from the local repository to the given destination.

1835

1836

This is the symmetrical operation for pull. It helps to move

1836

This is the symmetrical operation for pull. It helps to move

1837

changes from the current repository to a different one. If the

1837

changes from the current repository to a different one. If the

1838

destination is local this is identical to a pull in that directory

1838

destination is local this is identical to a pull in that directory

1839

from the current one.

1839

from the current one.

1840

1841

By default, push will refuse to run if it detects the result would

1841

By default, push will refuse to run if it detects the result would

1842

increase the number of remote heads. This generally indicates the

1842

increase the number of remote heads. This generally indicates the

1843

the client has forgotten to sync and merge before pushing.

1843

the client has forgotten to sync and merge before pushing.

1844

1845

Valid URLs are of the form:

1845

Valid URLs are of the form:

1846

1847

local/filesystem/path

1847

local/filesystem/path

1848

ssh://[user@]host[:port][/path]

1848

ssh://[user@]host[:port][/path]

1849

1850

SSH requires an accessible shell account on the destination

1850

SSH requires an accessible shell account on the destination

1851

machine and a copy of hg in the remote path.

1851

machine and a copy of hg in the remote path.

1852

"""

1852

"""

1853

dest = ui.expandpath(dest, repo.root)

1853

dest = ui.expandpath(dest, repo.root)

1854

ui.status('pushing to %s\n' % (dest))

1854

ui.status('pushing to %s\n' % (dest))

1855

1856

if opts['ssh']:

1856

if opts['ssh']:

1857

ui.setconfig("ui", "ssh", opts['ssh'])

1857

ui.setconfig("ui", "ssh", opts['ssh'])

1858

if opts['remotecmd']:

1858

if opts['remotecmd']:

1859

ui.setconfig("ui", "remotecmd", opts['remotecmd'])

1859

ui.setconfig("ui", "remotecmd", opts['remotecmd'])

1860

1861

other = hg.repository(ui, dest)

1861

other = hg.repository(ui, dest)

1862

revs = None

1862

revs = None

1863

if opts['rev']:

1863

if opts['rev']:

1864

revs = [repo.lookup(rev) for rev in opts['rev']]

1864

revs = [repo.lookup(rev) for rev in opts['rev']]

1865

r = repo.push(other, opts['force'], revs=revs)

1865

r = repo.push(other, opts['force'], revs=revs)

1866

return r

1866

return r

1867

1868

def rawcommit(ui, repo, *flist, **rc):

1868

def rawcommit(ui, repo, *flist, **rc):

1869

"""raw commit interface (DEPRECATED)

1869

"""raw commit interface (DEPRECATED)

1870

1871

(DEPRECATED)

1871

(DEPRECATED)

1872

Lowlevel commit, for use in helper scripts.

1872

Lowlevel commit, for use in helper scripts.

1873

1874

This command is not intended to be used by normal users, as it is

1874

This command is not intended to be used by normal users, as it is

1875

primarily useful for importing from other SCMs.

1875

primarily useful for importing from other SCMs.

1876

1877

This command is now deprecated and will be removed in a future

1877

This command is now deprecated and will be removed in a future

1878

release, please use debugsetparents and commit instead.

1878

release, please use debugsetparents and commit instead.

1879

"""

1879

"""

1880

1881

ui.warn(_("(the rawcommit command is deprecated)\n"))

1881

ui.warn(_("(the rawcommit command is deprecated)\n"))

1882

1883

message = rc['message']

1883

message = rc['message']

1884

if not message and rc['logfile']:

1884

if not message and rc['logfile']:

1885

try:

1885

try:

1886

message = open(rc['logfile']).read()

1886

message = open(rc['logfile']).read()

1887

except IOError:

1887

except IOError:

1888

pass

1888

pass

1889

if not message and not rc['logfile']:

1889

if not message and not rc['logfile']:

1890

raise util.Abort(_("missing commit message"))

1890

raise util.Abort(_("missing commit message"))

1891

1892

files = relpath(repo, list(flist))

1892

files = relpath(repo, list(flist))

1893

if rc['files']:

1893

if rc['files']:

1894

files += open(rc['files']).read().splitlines()

1894

files += open(rc['files']).read().splitlines()

1895

1896

rc['parent'] = map(repo.lookup, rc['parent'])

1896

rc['parent'] = map(repo.lookup, rc['parent'])

1897

1898

try:

1898

try:

1899

repo.rawcommit(files, message, rc['user'], rc['date'], *rc['parent'])

1899

repo.rawcommit(files, message, rc['user'], rc['date'], *rc['parent'])

1900

except ValueError, inst:

1900

except ValueError, inst:

1901

raise util.Abort(str(inst))

1901

raise util.Abort(str(inst))

1902

1903

def recover(ui, repo):

1903

def recover(ui, repo):

1904

"""roll back an interrupted transaction

1904

"""roll back an interrupted transaction

1905

1906

Recover from an interrupted commit or pull.

1906

Recover from an interrupted commit or pull.

1907

1908

This command tries to fix the repository status after an interrupted

1908

This command tries to fix the repository status after an interrupted

1909

operation. It should only be necessary when Mercurial suggests it.

1909

operation. It should only be necessary when Mercurial suggests it.

1910

"""

1910

"""

1911

if repo.recover():

1911

if repo.recover():

1912

return repo.verify()

1912

return repo.verify()

1913

return False

1913

return False

1914

1915

def remove(ui, repo, pat, *pats, **opts):

1915

def remove(ui, repo, pat, *pats, **opts):

1916

"""remove the specified files on the next commit

1916

"""remove the specified files on the next commit

1917

1918

Schedule the indicated files for removal from the repository.

1918

Schedule the indicated files for removal from the repository.

1919

1920

This command schedules the files to be removed at the next commit.

1920

This command schedules the files to be removed at the next commit.

1921

This only removes files from the current branch, not from the

1921

This only removes files from the current branch, not from the

1922

entire project history. If the files still exist in the working

1922

entire project history. If the files still exist in the working

1923

directory, they will be deleted from it.

1923

directory, they will be deleted from it.

1924

"""

1924

"""

1925

names = []

1925

names = []

1926

def okaytoremove(abs, rel, exact):

1926

def okaytoremove(abs, rel, exact):

1927

modified, added, removed, deleted, unknown = repo.changes(files=[abs])

1927

modified, added, removed, deleted, unknown = repo.changes(files=[abs])

1928

reason = None

1928

reason = None

1929

if modified and not opts['force']:

1929

if modified and not opts['force']:

1930

reason = _('is modified')

1930

reason = _('is modified')

1931

elif added:

1931

elif added:

1932

reason = _('has been marked for add')

1932

reason = _('has been marked for add')

1933

elif unknown:

1933

elif unknown:

1934

reason = _('is not managed')

1934

reason = _('is not managed')

1935

if reason:

1935

if reason:

1936

if exact:

1936

if exact:

1937

ui.warn(_('not removing %s: file %s\n') % (rel, reason))

1937

ui.warn(_('not removing %s: file %s\n') % (rel, reason))

1938

else:

1938

else:

1939

return True

1939

return True

1940

for src, abs, rel, exact in walk(repo, (pat,) + pats, opts):

1940

for src, abs, rel, exact in walk(repo, (pat,) + pats, opts):

1941

if okaytoremove(abs, rel, exact):

1941

if okaytoremove(abs, rel, exact):

1942

if ui.verbose or not exact:

1942

if ui.verbose or not exact:

1943

ui.status(_('removing %s\n') % rel)

1943

ui.status(_('removing %s\n') % rel)

1944

names.append(abs)

1944

names.append(abs)

1945

repo.remove(names, unlink=True)

1945

repo.remove(names, unlink=True)

1946

1947

def rename(ui, repo, *pats, **opts):

1947

def rename(ui, repo, *pats, **opts):

1948

"""rename files; equivalent of copy + remove

1948

"""rename files; equivalent of copy + remove

1949

1950

Mark dest as copies of sources; mark sources for deletion. If

1950

Mark dest as copies of sources; mark sources for deletion. If

1951

dest is a directory, copies are put in that directory. If dest is

1951

dest is a directory, copies are put in that directory. If dest is

1952

a file, there can only be one source.

1952

a file, there can only be one source.

1953

1954

By default, this command copies the contents of files as they

1954

By default, this command copies the contents of files as they

1955

stand in the working directory. If invoked with --after, the

1955

stand in the working directory. If invoked with --after, the

1956

operation is recorded, but no copying is performed.

1956

operation is recorded, but no copying is performed.

1957

1958

This command takes effect in the next commit.

1958

This command takes effect in the next commit.

1959

1960

NOTE: This command should be treated as experimental. While it

1960

NOTE: This command should be treated as experimental. While it

1961

should properly record rename files, this information is not yet

1961

should properly record rename files, this information is not yet

1962

fully used by merge, nor fully reported by log.

1962

fully used by merge, nor fully reported by log.

1963

"""

1963

"""

1964

try:

1964

try:

1965

wlock = repo.wlock(0)

1965

wlock = repo.wlock(0)

1966

errs, copied = docopy(ui, repo, pats, opts, wlock)

1966

errs, copied = docopy(ui, repo, pats, opts, wlock)

1967

names = []

1967

names = []

1968

for abs, rel, exact in copied:

1968

for abs, rel, exact in copied:

1969

if ui.verbose or not exact:

1969

if ui.verbose or not exact:

1970

ui.status(_('removing %s\n') % rel)

1970

ui.status(_('removing %s\n') % rel)

1971

names.append(abs)

1971

names.append(abs)

1972

repo.remove(names, True, wlock)

1972

repo.remove(names, True, wlock)

1973

except lock.LockHeld, inst:

1973

except lock.LockHeld, inst:

1974

ui.warn(_("repository lock held by %s\n") % inst.args[0])

1974

ui.warn(_("repository lock held by %s\n") % inst.args[0])

1975

errs = 1

1975

errs = 1

1976

return errs

1976

return errs

1977

1978

def revert(ui, repo, *pats, **opts):

1978

def revert(ui, repo, *pats, **opts):

1979

"""revert modified files or dirs back to their unmodified states

1979

"""revert modified files or dirs back to their unmodified states

1980

1981

In its default mode, it reverts any uncommitted modifications made

1981

In its default mode, it reverts any uncommitted modifications made

1982

to the named files or directories. This restores the contents of

1982

to the named files or directories. This restores the contents of

1983

the affected files to an unmodified state.

1983

the affected files to an unmodified state.

1984

1985

Using the -r option, it reverts the given files or directories to

1985

Using the -r option, it reverts the given files or directories to

1986

their state as of an earlier revision. This can be helpful to "roll

1986

their state as of an earlier revision. This can be helpful to "roll

1987

back" some or all of a change that should not have been committed.

1987

back" some or all of a change that should not have been committed.

1988

1989

Revert modifies the working directory. It does not commit any

1989

Revert modifies the working directory. It does not commit any

1990

changes, or change the parent of the current working directory.

1990

changes, or change the parent of the current working directory.

1991

1992

If a file has been deleted, it is recreated. If the executable

1992

If a file has been deleted, it is recreated. If the executable

1993

mode of a file was changed, it is reset.

1993

mode of a file was changed, it is reset.

1994

1995

If names are given, all files matching the names are reverted.

1995

If names are given, all files matching the names are reverted.

1996

1997

If no arguments are given, all files in the repository are reverted.

1997

If no arguments are given, all files in the repository are reverted.

1998

"""

1998

"""

1999

node = opts['rev'] and repo.lookup(opts['rev']) or \

1999

node = opts['rev'] and repo.lookup(opts['rev']) or \

2000

repo.dirstate.parents()[0]

2000

repo.dirstate.parents()[0]

2001

2002

files, choose, anypats = matchpats(repo, pats, opts)

2002

files, choose, anypats = matchpats(repo, pats, opts)

2003

modified, added, removed, deleted, unknown = repo.changes(match=choose)

2003

modified, added, removed, deleted, unknown = repo.changes(match=choose)

2004

repo.forget(added)

2004

repo.forget(added)

2005

repo.undelete(removed)

2005

repo.undelete(removed)

2006

2007

return repo.update(node, False, True, choose, False)

2007

return repo.update(node, False, True, choose, False)

2008

2009

def root(ui, repo):

2009

def root(ui, repo):

2010

"""print the root (top) of the current working dir

2010

"""print the root (top) of the current working dir

2011

2012

Print the root directory of the current repository.

2012

Print the root directory of the current repository.

2013

"""

2013

"""

2014

ui.write(repo.root + "\n")

2014

ui.write(repo.root + "\n")

2015

2016

def serve(ui, repo, **opts):

2016

def serve(ui, repo, **opts):

2017

"""export the repository via HTTP

2017

"""export the repository via HTTP

2018

2019

Start a local HTTP repository browser and pull server.

2019

Start a local HTTP repository browser and pull server.

2020

2021

By default, the server logs accesses to stdout and errors to

2021

By default, the server logs accesses to stdout and errors to

2022

stderr. Use the "-A" and "-E" options to log to files.

2022

stderr. Use the "-A" and "-E" options to log to files.

2023

"""

2023

"""

2024

2025

if opts["stdio"]:

2025

if opts["stdio"]:

2026

fin, fout = sys.stdin, sys.stdout

2026

fin, fout = sys.stdin, sys.stdout

2027

sys.stdout = sys.stderr

2027

sys.stdout = sys.stderr

2028

2029

# Prevent insertion/deletion of CRs

2029

# Prevent insertion/deletion of CRs

2030

util.set_binary(fin)

2030

util.set_binary(fin)

2031

util.set_binary(fout)

2031

util.set_binary(fout)

2032

2033

def getarg():

2033

def getarg():

2034

argline = fin.readline()[:-1]

2034

argline = fin.readline()[:-1]

2035

arg, l = argline.split()

2035

arg, l = argline.split()

2036

val = fin.read(int(l))

2036

val = fin.read(int(l))

2037

return arg, val

2037

return arg, val

2038

def respond(v):

2038

def respond(v):

2039

fout.write("%d\n" % len(v))

2039

fout.write("%d\n" % len(v))

2040

fout.write(v)

2040

fout.write(v)

2041

fout.flush()

2041

fout.flush()

2042

2043

lock = None

2043

lock = None

2044

2045

while 1:

2045

while 1:

2046

cmd = fin.readline()[:-1]

2046

cmd = fin.readline()[:-1]

2047

if cmd == '':

2047

if cmd == '':

2048

return

2048

return

2049

if cmd == "heads":

2049

if cmd == "heads":

2050

h = repo.heads()

2050

h = repo.heads()

2051

respond(" ".join(map(hex, h)) + "\n")

2051

respond(" ".join(map(hex, h)) + "\n")

2052

if cmd == "lock":

2052

if cmd == "lock":

2053

lock = repo.lock()

2053

lock = repo.lock()

2054

respond("")

2054

respond("")

2055

if cmd == "unlock":

2055

if cmd == "unlock":

2056

if lock:

2056

if lock:

2057

lock.release()

2057

lock.release()

2058

lock = None

2058

lock = None

2059

respond("")

2059

respond("")

2060

elif cmd == "branches":

2060

elif cmd == "branches":

2061

arg, nodes = getarg()

2061

arg, nodes = getarg()

2062

nodes = map(bin, nodes.split(" "))

2062

nodes = map(bin, nodes.split(" "))

2063

r = []

2063

r = []

2064

for b in repo.branches(nodes):

2064

for b in repo.branches(nodes):

2065

r.append(" ".join(map(hex, b)) + "\n")

2065

r.append(" ".join(map(hex, b)) + "\n")

2066

respond("".join(r))

2066

respond("".join(r))

2067

elif cmd == "between":

2067

elif cmd == "between":

2068

arg, pairs = getarg()

2068

arg, pairs = getarg()

2069

pairs = [map(bin, p.split("-")) for p in pairs.split(" ")]

2069

pairs = [map(bin, p.split("-")) for p in pairs.split(" ")]

2070

r = []

2070

r = []

2071

for b in repo.between(pairs):

2071

for b in repo.between(pairs):

2072

r.append(" ".join(map(hex, b)) + "\n")

2072

r.append(" ".join(map(hex, b)) + "\n")

2073

respond("".join(r))

2073

respond("".join(r))

2074

elif cmd == "changegroup":

2074

elif cmd == "changegroup":

2075

nodes = []

2075

nodes = []

2076

arg, roots = getarg()

2076

arg, roots = getarg()

2077

nodes = map(bin, roots.split(" "))

2077

nodes = map(bin, roots.split(" "))

2078

2079

cg = repo.changegroup(nodes, 'serve')

2079

cg = repo.changegroup(nodes, 'serve')

2080

while 1:

2080

while 1:

2081

d = cg.read(4096)

2081

d = cg.read(4096)

2082

if not d:

2082

if not d:

2083

break

2083

break

2084

fout.write(d)

2084

fout.write(d)

2085

2086

fout.flush()

2086

fout.flush()

2087

2088

elif cmd == "addchangegroup":

2088

elif cmd == "addchangegroup":

2089

if not lock:

2089

if not lock:

2090

respond("not locked")

2090

respond("not locked")

2091

continue

2091

continue

2092

respond("")

2092

respond("")

2093

2094

r = repo.addchangegroup(fin)

2094

r = repo.addchangegroup(fin)

2095

respond("")

2095

respond("")

2096

2097

optlist = "name templates style address port ipv6 accesslog errorlog"

2097

optlist = "name templates style address port ipv6 accesslog errorlog"

2098

for o in optlist.split():

2098

for o in optlist.split():

2099

if opts[o]:

2099

if opts[o]:

2100

ui.setconfig("web", o, opts[o])

2100

ui.setconfig("web", o, opts[o])

2101

2102

if opts['daemon'] and not opts['daemon_pipefds']:

2102

if opts['daemon'] and not opts['daemon_pipefds']:

2103

rfd, wfd = os.pipe()

2103

rfd, wfd = os.pipe()

2104

args = sys.argv[:]

2104

args = sys.argv[:]

2105

args.append('--daemon-pipefds=%d,%d' % (rfd, wfd))

2105

args.append('--daemon-pipefds=%d,%d' % (rfd, wfd))

2106

pid = os.spawnvp(os.P_NOWAIT | getattr(os, 'P_DETACH', 0),

2106

pid = os.spawnvp(os.P_NOWAIT | getattr(os, 'P_DETACH', 0),

2107

args[0], args)

2107

args[0], args)

2108

os.close(wfd)

2108

os.close(wfd)

2109

os.read(rfd, 1)

2109

os.read(rfd, 1)

2110

os._exit(0)

2110

os._exit(0)

2111

2112

try:

2112

try:

2113

httpd = hgweb.create_server(repo)

2113

httpd = hgweb.create_server(repo)

2114

except socket.error, inst:

2114

except socket.error, inst:

2115

raise util.Abort(_('cannot start server: ') + inst.args[1])

2115

raise util.Abort(_('cannot start server: ') + inst.args[1])

2116

2117

if ui.verbose:

2117

if ui.verbose:

2118

addr, port = httpd.socket.getsockname()

2118

addr, port = httpd.socket.getsockname()

2119

if addr == '0.0.0.0':

2119

if addr == '0.0.0.0':

2120

addr = socket.gethostname()

2120

addr = socket.gethostname()

2121

else:

2121

else:

2122

try:

2122

try:

2123

addr = socket.gethostbyaddr(addr)[0]

2123

addr = socket.gethostbyaddr(addr)[0]

2124

except socket.error:

2124

except socket.error:

2125

pass

2125

pass

2126

if port != 80:

2126

if port != 80:

2127

ui.status(_('listening at http://%s:%d/\n') % (addr, port))

2127

ui.status(_('listening at http://%s:%d/\n') % (addr, port))

2128

else:

2128

else:

2129

ui.status(_('listening at http://%s/\n') % addr)

2129

ui.status(_('listening at http://%s/\n') % addr)

2130

2131

if opts['pid_file']:

2131

if opts['pid_file']:

2132

fp = open(opts['pid_file'], 'w')

2132

fp = open(opts['pid_file'], 'w')

2133

fp.write(str(os.getpid()))

2133

fp.write(str(os.getpid()))

2134

fp.close()

2134

fp.close()

2135

2136

if opts['daemon_pipefds']:

2136

if opts['daemon_pipefds']:

2137

rfd, wfd = [int(x) for x in opts['daemon_pipefds'].split(',')]

2137

rfd, wfd = [int(x) for x in opts['daemon_pipefds'].split(',')]

2138

os.close(rfd)

2138

os.close(rfd)

2139

os.write(wfd, 'y')

2139

os.write(wfd, 'y')

2140

os.close(wfd)

2140

os.close(wfd)

2141

sys.stdout.flush()

2141

sys.stdout.flush()

2142

sys.stderr.flush()

2142

sys.stderr.flush()

2143

fd = os.open(util.nulldev, os.O_RDWR)

2143

fd = os.open(util.nulldev, os.O_RDWR)

2144

if fd != 0: os.dup2(fd, 0)

2144

if fd != 0: os.dup2(fd, 0)

2145

if fd != 1: os.dup2(fd, 1)

2145

if fd != 1: os.dup2(fd, 1)

2146

if fd != 2: os.dup2(fd, 2)

2146

if fd != 2: os.dup2(fd, 2)

2147

if fd not in (0, 1, 2): os.close(fd)

2147

if fd not in (0, 1, 2): os.close(fd)

2148

2149

httpd.serve_forever()

2149

httpd.serve_forever()

2150

2151

def status(ui, repo, *pats, **opts):

2151

def status(ui, repo, *pats, **opts):

2152

"""show changed files in the working directory

2152

"""show changed files in the working directory

2153

2154

Show changed files in the repository. If names are

2154

Show changed files in the repository. If names are

2155

given, only files that match are shown.

2155

given, only files that match are shown.

2156

2157

The codes used to show the status of files are:

2157

The codes used to show the status of files are:

2158

M = modified

2158

M = modified

2159

A = added

2159

A = added

2160

R = removed

2160

R = removed

2161

! = deleted, but still tracked

2161

! = deleted, but still tracked

2162

? = not tracked

2162

? = not tracked

2163

"""

2163

"""

2164

2165

files, matchfn, anypats = matchpats(repo, pats, opts)

2165

files, matchfn, anypats = matchpats(repo, pats, opts)

2166

cwd = (pats and repo.getcwd()) or ''

2166

cwd = (pats and repo.getcwd()) or ''

2167

modified, added, removed, deleted, unknown = [

2167

modified, added, removed, deleted, unknown = [

2168

[util.pathto(cwd, x) for x in n]

2168

[util.pathto(cwd, x) for x in n]

2169

for n in repo.changes(files=files, match=matchfn)]

2169

for n in repo.changes(files=files, match=matchfn)]

2170

2171

changetypes = [(_('modified'), 'M', modified),

2171

changetypes = [(_('modified'), 'M', modified),

2172

(_('added'), 'A', added),

2172

(_('added'), 'A', added),

2173

(_('removed'), 'R', removed),

2173

(_('removed'), 'R', removed),

2174

(_('deleted'), '!', deleted),

2174

(_('deleted'), '!', deleted),

2175

(_('unknown'), '?', unknown)]

2175

(_('unknown'), '?', unknown)]

2176

2177

end = opts['print0'] and '\0' or '\n'

2177

end = opts['print0'] and '\0' or '\n'

2178

2179

for opt, char, changes in ([ct for ct in changetypes if opts[ct[0]]]

2179

for opt, char, changes in ([ct for ct in changetypes if opts[ct[0]]]

2180

or changetypes):

2180

or changetypes):

2181

if opts['no_status']:

2181

if opts['no_status']:

2182

format = "%%s%s" % end

2182

format = "%%s%s" % end

2183

else:

2183

else:

2184

format = "%s %%s%s" % (char, end);

2184

format = "%s %%s%s" % (char, end);

2185

2186

for f in changes:

2186

for f in changes:

2187

ui.write(format % f)

2187

ui.write(format % f)

2188

2189

def tag(ui, repo, name, rev_=None, **opts):

2189

def tag(ui, repo, name, rev_=None, **opts):

2190

"""add a tag for the current tip or a given revision

2190

"""add a tag for the current tip or a given revision

2191

2192

Name a particular revision using <name>.

2192

Name a particular revision using <name>.

2193

2194

Tags are used to name particular revisions of the repository and are

2194

Tags are used to name particular revisions of the repository and are

2195

very useful to compare different revision, to go back to significant

2195

very useful to compare different revision, to go back to significant

2196

earlier versions or to mark branch points as releases, etc.

2196

earlier versions or to mark branch points as releases, etc.

2197

2198

If no revision is given, the tip is used.

2198

If no revision is given, the tip is used.

2199

2200

To facilitate version control, distribution, and merging of tags,

2200

To facilitate version control, distribution, and merging of tags,

2201

they are stored as a file named ".hgtags" which is managed

2201

they are stored as a file named ".hgtags" which is managed

2202

similarly to other project files and can be hand-edited if

2202

similarly to other project files and can be hand-edited if

2203

necessary. The file '.hg/localtags' is used for local tags (not

2203

necessary. The file '.hg/localtags' is used for local tags (not

2204

shared among repositories).

2204

shared among repositories).

2205

"""

2205

"""

2206

if name == "tip":

2206

if name == "tip":

2207

raise util.Abort(_("the name 'tip' is reserved"))

2207

raise util.Abort(_("the name 'tip' is reserved"))

2208

if rev_ is not None:

2208

if rev_ is not None:

2209

ui.warn(_("use of 'hg tag NAME [REV]' is deprecated, "

2209

ui.warn(_("use of 'hg tag NAME [REV]' is deprecated, "

2210

"please use 'hg tag [-r REV] NAME' instead\n"))

2210

"please use 'hg tag [-r REV] NAME' instead\n"))

2211

if opts['rev']:

2211

if opts['rev']:

2212

raise util.Abort(_("use only one form to specify the revision"))

2212

raise util.Abort(_("use only one form to specify the revision"))

2213

if opts['rev']:

2213

if opts['rev']:

2214

rev_ = opts['rev']

2214

rev_ = opts['rev']

2215

if rev_:

2215

if rev_:

2216

r = hex(repo.lookup(rev_))

2216

r = hex(repo.lookup(rev_))

2217

else:

2217

else:

2218

r = hex(repo.changelog.tip())

2218

r = hex(repo.changelog.tip())

2219

2220

disallowed = (revrangesep, '\r', '\n')

2220

disallowed = (revrangesep, '\r', '\n')

2221

for c in disallowed:

2221

for c in disallowed:

2222

if name.find(c) >= 0:

2222

if name.find(c) >= 0:

2223

raise util.Abort(_("%s cannot be used in a tag name") % repr(c))

2223

raise util.Abort(_("%s cannot be used in a tag name") % repr(c))

2224

2225

repo.hook('pretag', throw=True, node=r, tag=name,

2225

repo.hook('pretag', throw=True, node=r, tag=name,

2226

local=int(not not opts['local']))

2226

local=int(not not opts['local']))

2227

2228

if opts['local']:

2228

if opts['local']:

2229

repo.opener("localtags", "a").write("%s %s\n" % (r, name))

2229

repo.opener("localtags", "a").write("%s %s\n" % (r, name))

2230

repo.hook('tag', node=r, tag=name, local=1)

2230

repo.hook('tag', node=r, tag=name, local=1)

2231

return

2231

return

2232

2233

for x in repo.changes():

2233

for x in repo.changes():

2234

if ".hgtags" in x:

2234

if ".hgtags" in x:

2235

raise util.Abort(_("working copy of .hgtags is changed "

2235

raise util.Abort(_("working copy of .hgtags is changed "

2236

"(please commit .hgtags manually)"))

2236

"(please commit .hgtags manually)"))

2237

2238

repo.wfile(".hgtags", "ab").write("%s %s\n" % (r, name))

2238

repo.wfile(".hgtags", "ab").write("%s %s\n" % (r, name))

2239

if repo.dirstate.state(".hgtags") == '?':

2239

if repo.dirstate.state(".hgtags") == '?':

2240

repo.add([".hgtags"])

2240

repo.add([".hgtags"])

2241

2242

message = (opts['message'] or

2242

message = (opts['message'] or

2243

_("Added tag %s for changeset %s") % (name, r))

2243

_("Added tag %s for changeset %s") % (name, r))

2244

try:

2244

try:

2245

repo.commit([".hgtags"], message, opts['user'], opts['date'])

2245

repo.commit([".hgtags"], message, opts['user'], opts['date'])

2246

repo.hook('tag', node=r, tag=name, local=0)

2246

repo.hook('tag', node=r, tag=name, local=0)

2247

except ValueError, inst:

2247

except ValueError, inst:

2248

raise util.Abort(str(inst))

2248

raise util.Abort(str(inst))

2249

2250

def tags(ui, repo):

2250

def tags(ui, repo):

2251

"""list repository tags

2251

"""list repository tags

2252

2253

List the repository tags.

2253

List the repository tags.

2254

2255

This lists both regular and local tags.

2255

This lists both regular and local tags.

2256

"""

2256

"""

2257

2258

l = repo.tagslist()

2258

l = repo.tagslist()

2259

l.reverse()

2259

l.reverse()

2260

for t, n in l:

2260

for t, n in l:

2261

try:

2261

try:

2262

r = "%5d:%s" % (repo.changelog.rev(n), hex(n))

2262

r = "%5d:%s" % (repo.changelog.rev(n), hex(n))

2263

except KeyError:

2263

except KeyError:

2264

r = " ?:?"

2264

r = " ?:?"

2265

ui.write("%-30s %s\n" % (t, r))

2265

ui.write("%-30s %s\n" % (t, r))

2266

2267

def tip(ui, repo, **opts):

2267

def tip(ui, repo, **opts):

2268

"""show the tip revision

2268

"""show the tip revision

2269

2270

Show the tip revision.

2270

Show the tip revision.

2271

"""

2271

"""

2272

n = repo.changelog.tip()

2272

n = repo.changelog.tip()

2273

br = None

2273

br = None

2274

if opts['branches']:

2274

if opts['branches']:

2275

br = repo.branchlookup([n])

2275

br = repo.branchlookup([n])

2276

show_changeset(ui, repo, changenode=n, brinfo=br)

2276

show_changeset(ui, repo, changenode=n, brinfo=br)

2277

if opts['patch']:

2277

if opts['patch']:

2278

dodiff(ui, ui, repo, repo.changelog.parents(n)[0], n)

2278

dodiff(ui, ui, repo, repo.changelog.parents(n)[0], n)

2279

2280

def unbundle(ui, repo, fname, **opts):

2280

def unbundle(ui, repo, fname, **opts):

2281

"""apply a changegroup file

2281

"""apply a changegroup file

2282

2283

Apply a compressed changegroup file generated by the bundle

2283

Apply a compressed changegroup file generated by the bundle

2284

command.

2284

command.

2285

"""

2285

"""

2286

f = urllib.urlopen(fname)

2286

f = urllib.urlopen(fname)

2287

2288

if f.read(4) != "HG10":

2288

if f.read(4) != "HG10":

2289

raise util.Abort(_("%s: not a Mercurial bundle file") % fname)

2289

raise util.Abort(_("%s: not a Mercurial bundle file") % fname)

2290

2291

def bzgenerator(f):

2291

def bzgenerator(f):

2292

zd = bz2.BZ2Decompressor()

2292

zd = bz2.BZ2Decompressor()

2293

for chunk in f:

2293

for chunk in f:

2294

yield zd.decompress(chunk)

2294

yield zd.decompress(chunk)

2295

2296

bzgen = bzgenerator(util.filechunkiter(f, 4096))

2296

bzgen = bzgenerator(util.filechunkiter(f, 4096))

2297

if repo.addchangegroup(util.chunkbuffer(bzgen)):

2297

if repo.addchangegroup(util.chunkbuffer(bzgen)):

2298

return 1

2298

return 1

2299

2300

if opts['update']:

2300

if opts['update']:

2301

return update(ui, repo)

2301

return update(ui, repo)

2302

else:

2302

else:

2303

ui.status(_("(run 'hg update' to get a working copy)\n"))

2303

ui.status(_("(run 'hg update' to get a working copy)\n"))

2304

2305

def undo(ui, repo):

2305

def undo(ui, repo):

2306

"""undo the last commit or pull

2306

"""undo the last commit or pull

2307

2308

Roll back the last pull or commit transaction on the

2308

Roll back the last pull or commit transaction on the

2309

repository, restoring the project to its earlier state.

2309

repository, restoring the project to its earlier state.

2310

2311

This command should be used with care. There is only one level of

2311

This command should be used with care. There is only one level of

2312

undo and there is no redo.

2312

undo and there is no redo.

2313

2314

This command is not intended for use on public repositories. Once

2314

This command is not intended for use on public repositories. Once

2315

a change is visible for pull by other users, undoing it locally is

2315

a change is visible for pull by other users, undoing it locally is

2316

ineffective.

2316

ineffective.

2317

"""

2317

"""

2318

repo.undo()

2318

repo.undo()

2319

2320

def update(ui, repo, node=None, merge=False, clean=False, force=None,

2320

def update(ui, repo, node=None, merge=False, clean=False, force=None,

2321

branch=None):

2321

branch=None):

2322

"""update or merge working directory

2322

"""update or merge working directory

2323

2324

Update the working directory to the specified revision.

2324

Update the working directory to the specified revision.

2325

2326

If there are no outstanding changes in the working directory and

2326

If there are no outstanding changes in the working directory and

2327

there is a linear relationship between the current version and the

2327

there is a linear relationship between the current version and the

2328

requested version, the result is the requested version.

2328

requested version, the result is the requested version.

2329

2330

Otherwise the result is a merge between the contents of the

2330

Otherwise the result is a merge between the contents of the

2331

current working directory and the requested version. Files that

2331

current working directory and the requested version. Files that

2332

changed between either parent are marked as changed for the next

2332

changed between either parent are marked as changed for the next

2333

commit and a commit must be performed before any further updates

2333

commit and a commit must be performed before any further updates

2334

are allowed.

2334

are allowed.

2335

2336

By default, update will refuse to run if doing so would require

2336

By default, update will refuse to run if doing so would require

2337

merging or discarding local changes.

2337

merging or discarding local changes.

2338

"""

2338

"""

2339

if branch:

2339

if branch:

2340

br = repo.branchlookup(branch=branch)

2340

br = repo.branchlookup(branch=branch)

2341

found = []

2341

found = []

2342

for x in br:

2342

for x in br:

2343

if branch in br[x]:

2343

if branch in br[x]:

2344

found.append(x)

2344

found.append(x)

2345

if len(found) > 1:

2345

if len(found) > 1:

2346

ui.warn(_("Found multiple heads for %s\n") % branch)

2346

ui.warn(_("Found multiple heads for %s\n") % branch)

2347

for x in found:

2347

for x in found:

2348

show_changeset(ui, repo, changenode=x, brinfo=br)

2348

show_changeset(ui, repo, changenode=x, brinfo=br)

2349

return 1

2349

return 1

2350

if len(found) == 1:

2350

if len(found) == 1:

2351

node = found[0]

2351

node = found[0]

2352

ui.warn(_("Using head %s for branch %s\n") % (short(node), branch))

2352

ui.warn(_("Using head %s for branch %s\n") % (short(node), branch))

2353

else:

2353

else:

2354

ui.warn(_("branch %s not found\n") % (branch))

2354

ui.warn(_("branch %s not found\n") % (branch))

2355

return 1

2355

return 1

2356

else:

2356

else:

2357

node = node and repo.lookup(node) or repo.changelog.tip()

2357

node = node and repo.lookup(node) or repo.changelog.tip()

2358

return repo.update(node, allow=merge, force=clean, forcemerge=force)

2358

return repo.update(node, allow=merge, force=clean, forcemerge=force)

2359

2360

def verify(ui, repo):

2360

def verify(ui, repo):

2361

"""verify the integrity of the repository

2361

"""verify the integrity of the repository

2362

2363

Verify the integrity of the current repository.

2363

Verify the integrity of the current repository.

2364

2365

This will perform an extensive check of the repository's

2365

This will perform an extensive check of the repository's

2366

integrity, validating the hashes and checksums of each entry in

2366

integrity, validating the hashes and checksums of each entry in

2367

the changelog, manifest, and tracked files, as well as the

2367

the changelog, manifest, and tracked files, as well as the

2368

integrity of their crosslinks and indices.

2368

integrity of their crosslinks and indices.

2369

"""

2369

"""

2370

return repo.verify()

2370

return repo.verify()

2371

2372

# Command options and aliases are listed here, alphabetically

2372

# Command options and aliases are listed here, alphabetically

2373

2374

table = {

2374

table = {

2375

"^add":

2375

"^add":

2376

(add,

2376

(add,

2377

[('I', 'include', [], _('include names matching the given patterns')),

2377

[('I', 'include', [], _('include names matching the given patterns')),

2378

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2378

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2379

_('hg add [OPTION]... [FILE]...')),

2379

_('hg add [OPTION]... [FILE]...')),

2380

"addremove":

2380

"addremove":

2381

(addremove,

2381

(addremove,

2382

[('I', 'include', [], _('include names matching the given patterns')),

2382

[('I', 'include', [], _('include names matching the given patterns')),

2383

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2383

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2384

_('hg addremove [OPTION]... [FILE]...')),

2384

_('hg addremove [OPTION]... [FILE]...')),

2385

"^annotate":

2385

"^annotate":

2386

(annotate,

2386

(annotate,

2387

[('r', 'rev', '', _('annotate the specified revision')),

2387

[('r', 'rev', '', _('annotate the specified revision')),

2388

('a', 'text', None, _('treat all files as text')),

2388

('a', 'text', None, _('treat all files as text')),

2389

('u', 'user', None, _('list the author')),

2389

('u', 'user', None, _('list the author')),

2390

('d', 'date', None, _('list the date')),

2390

('d', 'date', None, _('list the date')),

2391

('n', 'number', None, _('list the revision number (default)')),

2391

('n', 'number', None, _('list the revision number (default)')),

2392

('c', 'changeset', None, _('list the changeset')),

2392

('c', 'changeset', None, _('list the changeset')),

2393

('I', 'include', [], _('include names matching the given patterns')),

2393

('I', 'include', [], _('include names matching the given patterns')),

2394

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2394

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2395

_('hg annotate [-r REV] [-a] [-u] [-d] [-n] [-c] FILE...')),

2395

_('hg annotate [-r REV] [-a] [-u] [-d] [-n] [-c] FILE...')),

2396

"bundle":

2396

"bundle":

2397

(bundle,

2397

(bundle,

2398

[],

2398

[],

2399

_('hg bundle FILE DEST')),

2399

_('hg bundle FILE DEST')),

2400

"cat":

2400

"cat":

2401

(cat,

2401

(cat,

2402

[('o', 'output', '', _('print output to file with formatted name')),

2402

[('o', 'output', '', _('print output to file with formatted name')),

2403

('r', 'rev', '', _('print the given revision')),

2403

('r', 'rev', '', _('print the given revision')),

2404

('I', 'include', [], _('include names matching the given patterns')),

2404

('I', 'include', [], _('include names matching the given patterns')),

2405

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2405

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2406

_('hg cat [OPTION]... FILE...')),

2406

_('hg cat [OPTION]... FILE...')),

2407

"^clone":

2407

"^clone":

2408

(clone,

2408

(clone,

2409

[('U', 'noupdate', None, _('do not update the new working directory')),

2409

[('U', 'noupdate', None, _('do not update the new working directory')),

2410

('r', 'rev', [],

2410

('r', 'rev', [],

2411

_('a changeset you would like to have after cloning')),

2411

_('a changeset you would like to have after cloning')),

2412

('', 'pull', None, _('use pull protocol to copy metadata')),

2412

('', 'pull', None, _('use pull protocol to copy metadata')),

2413

('e', 'ssh', '', _('specify ssh command to use')),

2413

('e', 'ssh', '', _('specify ssh command to use')),

2414

('', 'remotecmd', '',

2414

('', 'remotecmd', '',

2415

_('specify hg command to run on the remote side'))],

2415

_('specify hg command to run on the remote side'))],

2416

_('hg clone [OPTION]... SOURCE [DEST]')),

2416

_('hg clone [OPTION]... SOURCE [DEST]')),

2417

"^commit|ci":

2417

"^commit|ci":

2418

(commit,

2418

(commit,

2419

[('A', 'addremove', None, _('run addremove during commit')),

2419

[('A', 'addremove', None, _('run addremove during commit')),

2420

('m', 'message', '', _('use <text> as commit message')),

2420

('m', 'message', '', _('use <text> as commit message')),

2421

('l', 'logfile', '', _('read the commit message from <file>')),

2421

('l', 'logfile', '', _('read the commit message from <file>')),

2422

('d', 'date', '', _('record datecode as commit date')),

2422

('d', 'date', '', _('record datecode as commit date')),

2423

('u', 'user', '', _('record user as commiter')),

2423

('u', 'user', '', _('record user as commiter')),

2424

('I', 'include', [], _('include names matching the given patterns')),

2424

('I', 'include', [], _('include names matching the given patterns')),

2425

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2425

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2426

_('hg commit [OPTION]... [FILE]...')),

2426

_('hg commit [OPTION]... [FILE]...')),

2427

"copy|cp":

2427

"copy|cp":

2428

(copy,

2428

(copy,

2429

[('A', 'after', None, _('record a copy that has already occurred')),

2429

[('A', 'after', None, _('record a copy that has already occurred')),

2430

('f', 'force', None,

2430

('f', 'force', None,

2431

_('forcibly copy over an existing managed file')),

2431

_('forcibly copy over an existing managed file')),

2432

('I', 'include', [], _('include names matching the given patterns')),

2432

('I', 'include', [], _('include names matching the given patterns')),

2433

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2433

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2434

_('hg copy [OPTION]... [SOURCE]... DEST')),

2434

_('hg copy [OPTION]... [SOURCE]... DEST')),

2435

"debugancestor": (debugancestor, [], _('debugancestor INDEX REV1 REV2')),

2435

"debugancestor": (debugancestor, [], _('debugancestor INDEX REV1 REV2')),

2436

"debugcomplete": (debugcomplete, [], _('debugcomplete CMD')),

2436

"debugcomplete": (debugcomplete, [], _('debugcomplete CMD')),

2437

"debugrebuildstate":

2437

"debugrebuildstate":

2438

(debugrebuildstate,

2438

(debugrebuildstate,

2439

[('r', 'rev', '', _('revision to rebuild to'))],

2439

[('r', 'rev', '', _('revision to rebuild to'))],

2440

_('debugrebuildstate [-r REV] [REV]')),

2440

_('debugrebuildstate [-r REV] [REV]')),

2441

"debugcheckstate": (debugcheckstate, [], _('debugcheckstate')),

2441

"debugcheckstate": (debugcheckstate, [], _('debugcheckstate')),

2442

"debugconfig": (debugconfig, [], _('debugconfig')),

2442

"debugconfig": (debugconfig, [], _('debugconfig')),

2443

"debugsetparents": (debugsetparents, [], _('debugsetparents REV1 [REV2]')),

2443

"debugsetparents": (debugsetparents, [], _('debugsetparents REV1 [REV2]')),

2444

"debugstate": (debugstate, [], _('debugstate')),

2444

"debugstate": (debugstate, [], _('debugstate')),

2445

"debugdata": (debugdata, [], _('debugdata FILE REV')),

2445

"debugdata": (debugdata, [], _('debugdata FILE REV')),

2446

"debugindex": (debugindex, [], _('debugindex FILE')),

2446

"debugindex": (debugindex, [], _('debugindex FILE')),

2447

"debugindexdot": (debugindexdot, [], _('debugindexdot FILE')),

2447

"debugindexdot": (debugindexdot, [], _('debugindexdot FILE')),

2448

"debugrename": (debugrename, [], _('debugrename FILE [REV]')),

2448

"debugrename": (debugrename, [], _('debugrename FILE [REV]')),

2449

"debugwalk":

2449

"debugwalk":

2450

(debugwalk,

2450

(debugwalk,

2451

[('I', 'include', [], _('include names matching the given patterns')),

2451

[('I', 'include', [], _('include names matching the given patterns')),

2452

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2452

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2453

_('debugwalk [OPTION]... [FILE]...')),

2453

_('debugwalk [OPTION]... [FILE]...')),

2454

"^diff":

2454

"^diff":

2455

(diff,

2455

(diff,

2456

[('r', 'rev', [], _('revision')),

2456

[('r', 'rev', [], _('revision')),

2457

('a', 'text', None, _('treat all files as text')),

2457

('a', 'text', None, _('treat all files as text')),

2458

('p', 'show-function', None,

2458

('p', 'show-function', None,

2459

_('show which function each change is in')),

2459

_('show which function each change is in')),

2460

('w', 'ignore-all-space', None,

2460

('w', 'ignore-all-space', None,

2461

_('ignore white space when comparing lines')),

2461

_('ignore white space when comparing lines')),

2462

('I', 'include', [], _('include names matching the given patterns')),

2462

('I', 'include', [], _('include names matching the given patterns')),

2463

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2463

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2464

_('hg diff [-a] [-I] [-X] [-r REV1 [-r REV2]] [FILE]...')),

2464

_('hg diff [-a] [-I] [-X] [-r REV1 [-r REV2]] [FILE]...')),

2465

"^export":

2465

"^export":

2466

(export,

2466

(export,

2467

[('o', 'output', '', _('print output to file with formatted name')),

2467

[('o', 'output', '', _('print output to file with formatted name')),

2468

('a', 'text', None, _('treat all files as text')),

2468

('a', 'text', None, _('treat all files as text')),

2469

('', 'switch-parent', None, _('diff against the second parent'))],

2469

('', 'switch-parent', None, _('diff against the second parent'))],

2470

_('hg export [-a] [-o OUTFILESPEC] REV...')),

2470

_('hg export [-a] [-o OUTFILESPEC] REV...')),

2471

"forget":

2471

"forget":

2472

(forget,

2472

(forget,

2473

[('I', 'include', [], _('include names matching the given patterns')),

2473

[('I', 'include', [], _('include names matching the given patterns')),

2474

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2474

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2475

_('hg forget [OPTION]... FILE...')),

2475

_('hg forget [OPTION]... FILE...')),

2476

"grep":

2476

"grep":

2477

(grep,

2477

(grep,

2478

[('0', 'print0', None, _('end fields with NUL')),

2478

[('0', 'print0', None, _('end fields with NUL')),

2479

('', 'all', None, _('print all revisions that match')),

2479

('', 'all', None, _('print all revisions that match')),

2480

('i', 'ignore-case', None, _('ignore case when matching')),

2480

('i', 'ignore-case', None, _('ignore case when matching')),

2481

('l', 'files-with-matches', None,

2481

('l', 'files-with-matches', None,

2482

_('print only filenames and revs that match')),

2482

_('print only filenames and revs that match')),

2483

('n', 'line-number', None, _('print matching line numbers')),

2483

('n', 'line-number', None, _('print matching line numbers')),

2484

('r', 'rev', [], _('search in given revision range')),

2484

('r', 'rev', [], _('search in given revision range')),

2485

('u', 'user', None, _('print user who committed change')),

2485

('u', 'user', None, _('print user who committed change')),

2486

('I', 'include', [], _('include names matching the given patterns')),

2486

('I', 'include', [], _('include names matching the given patterns')),

2487

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2487

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2488

_('hg grep [OPTION]... PATTERN [FILE]...')),

2488

_('hg grep [OPTION]... PATTERN [FILE]...')),

2489

"heads":

2489

"heads":

2490

(heads,

2490

(heads,

2491

[('b', 'branches', None, _('show branches')),

2491

[('b', 'branches', None, _('show branches')),

2492

('r', 'rev', '', _('show only heads which are descendants of rev'))],

2492

('r', 'rev', '', _('show only heads which are descendants of rev'))],

2493

_('hg heads [-b] [-r <rev>]')),

2493

_('hg heads [-b] [-r <rev>]')),

2494

"help": (help_, [], _('hg help [COMMAND]')),

2494

"help": (help_, [], _('hg help [COMMAND]')),

2495

"identify|id": (identify, [], _('hg identify')),

2495

"identify|id": (identify, [], _('hg identify')),

2496

"import|patch":

2496

"import|patch":

2497

(import_,

2497

(import_,

2498

[('p', 'strip', 1,

2498

[('p', 'strip', 1,

2499

_('directory strip option for patch. This has the same\n') +

2499

_('directory strip option for patch. This has the same\n') +

2500

_('meaning as the corresponding patch option')),

2500

_('meaning as the corresponding patch option')),

2501

('b', 'base', '', _('base path')),

2501

('b', 'base', '', _('base path')),

2502

('f', 'force', None,

2502

('f', 'force', None,

2503

_('skip check for outstanding uncommitted changes'))],

2503

_('skip check for outstanding uncommitted changes'))],

2504

_('hg import [-p NUM] [-b BASE] [-f] PATCH...')),

2504

_('hg import [-p NUM] [-b BASE] [-f] PATCH...')),

2505

"incoming|in": (incoming,

2505

"incoming|in": (incoming,

2506

[('M', 'no-merges', None, _('do not show merges')),

2506

[('M', 'no-merges', None, _('do not show merges')),

2507

('p', 'patch', None, _('show patch')),

2507

('p', 'patch', None, _('show patch')),

2508

('n', 'newest-first', None, _('show newest record first'))],

2508

('n', 'newest-first', None, _('show newest record first'))],

2509

_('hg incoming [-p] [-n] [-M] [SOURCE]')),

2509

_('hg incoming [-p] [-n] [-M] [SOURCE]')),

2510

"^init": (init, [], _('hg init [DEST]')),

2510

"^init": (init, [], _('hg init [DEST]')),

2511

"locate":

2511

"locate":

2512

(locate,

2512

(locate,

2513

[('r', 'rev', '', _('search the repository as it stood at rev')),

2513

[('r', 'rev', '', _('search the repository as it stood at rev')),

2514

('0', 'print0', None,

2514

('0', 'print0', None,

2515

_('end filenames with NUL, for use with xargs')),

2515

_('end filenames with NUL, for use with xargs')),

2516

('f', 'fullpath', None,

2516

('f', 'fullpath', None,

2517

_('print complete paths from the filesystem root')),

2517

_('print complete paths from the filesystem root')),

2518

('I', 'include', [], _('include names matching the given patterns')),

2518

('I', 'include', [], _('include names matching the given patterns')),

2519

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2519

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2520

_('hg locate [OPTION]... [PATTERN]...')),

2520

_('hg locate [OPTION]... [PATTERN]...')),

2521

"^log|history":

2521

"^log|history":

2522

(log,

2522

(log,

2523

[('b', 'branches', None, _('show branches')),

2523

[('b', 'branches', None, _('show branches')),

2524

('k', 'keyword', [], _('search for a keyword')),

2524

('k', 'keyword', [], _('search for a keyword')),

2525

('l', 'limit', '', _('limit number of changes displayed')),

2525

('l', 'limit', '', _('limit number of changes displayed')),

2526

('r', 'rev', [], _('show the specified revision or range')),

2526

('r', 'rev', [], _('show the specified revision or range')),

2527

('M', 'no-merges', None, _('do not show merges')),

2527

('M', 'no-merges', None, _('do not show merges')),

2528

('m', 'only-merges', None, _('show only merges')),

2528

('m', 'only-merges', None, _('show only merges')),

2529

('p', 'patch', None, _('show patch')),

2529

('p', 'patch', None, _('show patch')),

2530

('I', 'include', [], _('include names matching the given patterns')),

2530

('I', 'include', [], _('include names matching the given patterns')),

2531

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2531

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2532

_('hg log [OPTION]... [FILE]')),

2532

_('hg log [OPTION]... [FILE]')),

2533

"manifest": (manifest, [], _('hg manifest [REV]')),

2533

"manifest": (manifest, [], _('hg manifest [REV]')),

2534

"outgoing|out": (outgoing,

2534

"outgoing|out": (outgoing,

2535

[('M', 'no-merges', None, _('do not show merges')),

2535

[('M', 'no-merges', None, _('do not show merges')),

2536

('p', 'patch', None, _('show patch')),

2536

('p', 'patch', None, _('show patch')),

2537

('n', 'newest-first', None, _('show newest record first'))],

2537

('n', 'newest-first', None, _('show newest record first'))],

2538

_('hg outgoing [-M] [-p] [-n] [DEST]')),

2538

_('hg outgoing [-M] [-p] [-n] [DEST]')),

2539

"^parents":

2539

"^parents":

2540

(parents,

2540

(parents,

2541

[('b', 'branches', None, _('show branches'))],

2541

[('b', 'branches', None, _('show branches'))],

2542

_('hg parents [-b] [REV]')),

2542

_('hg parents [-b] [REV]')),

2543

"paths": (paths, [], _('hg paths [NAME]')),

2543

"paths": (paths, [], _('hg paths [NAME]')),

2544

"^pull":

2544

"^pull":

2545

(pull,

2545

(pull,

2546

[('u', 'update', None,

2546

[('u', 'update', None,

2547

_('update the working directory to tip after pull')),

2547

_('update the working directory to tip after pull')),

2548

('e', 'ssh', '', _('specify ssh command to use')),

2548

('e', 'ssh', '', _('specify ssh command to use')),

2549

('r', 'rev', [], _('a specific revision you would like to pull')),

2549

('r', 'rev', [], _('a specific revision you would like to pull')),

2550

('', 'remotecmd', '',

2550

('', 'remotecmd', '',

2551

_('specify hg command to run on the remote side'))],

2551

_('specify hg command to run on the remote side'))],

2552

_('hg pull [-u] [-e FILE] [-r REV]... [--remotecmd FILE] [SOURCE]')),

2552

_('hg pull [-u] [-e FILE] [-r REV]... [--remotecmd FILE] [SOURCE]')),

2553

"^push":

2553

"^push":

2554

(push,

2554

(push,

2555

[('f', 'force', None, _('force push')),

2555

[('f', 'force', None, _('force push')),

2556

('e', 'ssh', '', _('specify ssh command to use')),

2556

('e', 'ssh', '', _('specify ssh command to use')),

2557

('r', 'rev', [], _('a specific revision you would like to push')),

2557

('r', 'rev', [], _('a specific revision you would like to push')),

2558

('', 'remotecmd', '',

2558

('', 'remotecmd', '',

2559

_('specify hg command to run on the remote side'))],

2559

_('specify hg command to run on the remote side'))],

2560

_('hg push [-f] [-e FILE] [-r REV]... [--remotecmd FILE] [DEST]')),

2560

_('hg push [-f] [-e FILE] [-r REV]... [--remotecmd FILE] [DEST]')),

2561

"debugrawcommit|rawcommit":

2561

"debugrawcommit|rawcommit":

2562

(rawcommit,

2562

(rawcommit,

2563

[('p', 'parent', [], _('parent')),

2563

[('p', 'parent', [], _('parent')),

2564

('d', 'date', '', _('date code')),

2564

('d', 'date', '', _('date code')),

2565

('u', 'user', '', _('user')),

2565

('u', 'user', '', _('user')),

2566

('F', 'files', '', _('file list')),

2566

('F', 'files', '', _('file list')),

2567

('m', 'message', '', _('commit message')),

2567

('m', 'message', '', _('commit message')),

2568

('l', 'logfile', '', _('commit message file'))],

2568

('l', 'logfile', '', _('commit message file'))],

2569

_('hg debugrawcommit [OPTION]... [FILE]...')),

2569

_('hg debugrawcommit [OPTION]... [FILE]...')),

2570

"recover": (recover, [], _('hg recover')),

2570

"recover": (recover, [], _('hg recover')),

2571

"^remove|rm":

2571

"^remove|rm":

2572

(remove,

2572

(remove,

2573

[('f', 'force', None, _('remove file even if modified')),

2573

[('f', 'force', None, _('remove file even if modified')),

2574

('I', 'include', [], _('include names matching the given patterns')),

2574

('I', 'include', [], _('include names matching the given patterns')),

2575

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2575

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2576

_('hg remove [OPTION]... FILE...')),

2576

_('hg remove [OPTION]... FILE...')),

2577

"rename|mv":

2577

"rename|mv":

2578

(rename,

2578

(rename,

2579

[('A', 'after', None, _('record a rename that has already occurred')),

2579

[('A', 'after', None, _('record a rename that has already occurred')),

2580

('f', 'force', None,

2580

('f', 'force', None,

2581

_('forcibly copy over an existing managed file')),

2581

_('forcibly copy over an existing managed file')),

2582

('I', 'include', [], _('include names matching the given patterns')),

2582

('I', 'include', [], _('include names matching the given patterns')),

2583

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2583

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2584

_('hg rename [OPTION]... SOURCE... DEST')),

2584

_('hg rename [OPTION]... SOURCE... DEST')),

2585

"^revert":

2585

"^revert":

2586

(revert,

2586

(revert,

2587

[('r', 'rev', '', _('revision to revert to')),

2587

[('r', 'rev', '', _('revision to revert to')),

2588

('I', 'include', [], _('include names matching the given patterns')),

2588

('I', 'include', [], _('include names matching the given patterns')),

2589

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2589

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2590

_('hg revert [-r REV] [NAME]...')),

2590

_('hg revert [-r REV] [NAME]...')),

2591

"root": (root, [], _('hg root')),

2591

"root": (root, [], _('hg root')),

2592

"^serve":

2592

"^serve":

2593

(serve,

2593

(serve,

2594

[('A', 'accesslog', '', _('name of access log file to write to')),

2594

[('A', 'accesslog', '', _('name of access log file to write to')),

2595

('d', 'daemon', None, _('run server in background')),

2595

('d', 'daemon', None, _('run server in background')),

2596

('', 'daemon-pipefds', '', _('used internally by daemon mode')),

2596

('', 'daemon-pipefds', '', _('used internally by daemon mode')),

2597

('E', 'errorlog', '', _('name of error log file to write to')),

2597

('E', 'errorlog', '', _('name of error log file to write to')),

2598

('p', 'port', 0, _('port to use (default: 8000)')),

2598

('p', 'port', 0, _('port to use (default: 8000)')),

2599

('a', 'address', '', _('address to use')),

2599

('a', 'address', '', _('address to use')),

2600

('n', 'name', '',

2600

('n', 'name', '',

2601

_('name to show in web pages (default: working dir)')),

2601

_('name to show in web pages (default: working dir)')),

2602

('', 'pid-file', '', _('name of file to write process ID to')),

2602

('', 'pid-file', '', _('name of file to write process ID to')),

2603

('', 'stdio', None, _('for remote clients')),

2603

('', 'stdio', None, _('for remote clients')),

2604

('t', 'templates', '', _('web templates to use')),

2604

('t', 'templates', '', _('web templates to use')),

2605

('', 'style', '', _('template style to use')),

2605

('', 'style', '', _('template style to use')),

2606

('6', 'ipv6', None, _('use IPv6 in addition to IPv4'))],

2606

('6', 'ipv6', None, _('use IPv6 in addition to IPv4'))],

2607

_('hg serve [OPTION]...')),

2607

_('hg serve [OPTION]...')),

2608

"^status|st":

2608

"^status|st":

2609

(status,

2609

(status,

2610

[('m', 'modified', None, _('show only modified files')),

2610

[('m', 'modified', None, _('show only modified files')),

2611

('a', 'added', None, _('show only added files')),

2611

('a', 'added', None, _('show only added files')),

2612

('r', 'removed', None, _('show only removed files')),

2612

('r', 'removed', None, _('show only removed files')),

2613

('d', 'deleted', None, _('show only deleted (but tracked) files')),

2613

('d', 'deleted', None, _('show only deleted (but tracked) files')),

2614

('u', 'unknown', None, _('show only unknown (not tracked) files')),

2614

('u', 'unknown', None, _('show only unknown (not tracked) files')),

2615

('n', 'no-status', None, _('hide status prefix')),

2615

('n', 'no-status', None, _('hide status prefix')),

2616

('0', 'print0', None,

2616

('0', 'print0', None,

2617

_('end filenames with NUL, for use with xargs')),

2617

_('end filenames with NUL, for use with xargs')),

2618

('I', 'include', [], _('include names matching the given patterns')),

2618

('I', 'include', [], _('include names matching the given patterns')),

2619

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2619

('X', 'exclude', [], _('exclude names matching the given patterns'))],

2620

_('hg status [OPTION]... [FILE]...')),

2620

_('hg status [OPTION]... [FILE]...')),

2621

"tag":

2621

"tag":

2622

(tag,

2622

(tag,

2623

[('l', 'local', None, _('make the tag local')),

2623

[('l', 'local', None, _('make the tag local')),

2624

('m', 'message', '', _('message for tag commit log entry')),

2624

('m', 'message', '', _('message for tag commit log entry')),

2625

('d', 'date', '', _('record datecode as commit date')),

2625

('d', 'date', '', _('record datecode as commit date')),

2626

('u', 'user', '', _('record user as commiter')),

2626

('u', 'user', '', _('record user as commiter')),

2627

('r', 'rev', '', _('revision to tag'))],

2627

('r', 'rev', '', _('revision to tag'))],

2628

_('hg tag [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME')),

2628

_('hg tag [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME')),

2629

"tags": (tags, [], _('hg tags')),

2629

"tags": (tags, [], _('hg tags')),

2630

"tip":

2630

"tip":

2631

(tip,

2631

(tip,

2632

[('b', 'branches', None, _('show branches')),

2632

[('b', 'branches', None, _('show branches')),

2633

('p', 'patch', None, _('show patch'))],

2633

('p', 'patch', None, _('show patch'))],

2634

_('hg tip [-b] [-p]')),

2634

_('hg tip [-b] [-p]')),

2635

"unbundle":

2635

"unbundle":

2636

(unbundle,

2636

(unbundle,

2637

[('u', 'update', None,

2637

[('u', 'update', None,

2638

_('update the working directory to tip after unbundle'))],

2638

_('update the working directory to tip after unbundle'))],

2639

_('hg unbundle [-u] FILE')),

2639

_('hg unbundle [-u] FILE')),

2640

"undo": (undo, [], _('hg undo')),

2640

"undo": (undo, [], _('hg undo')),

2641

"^update|up|checkout|co":

2641

"^update|up|checkout|co":

2642

(update,

2642

(update,

2643

[('b', 'branch', '', _('checkout the head of a specific branch')),

2643

[('b', 'branch', '', _('checkout the head of a specific branch')),

2644

('m', 'merge', None, _('allow merging of branches')),

2644

('m', 'merge', None, _('allow merging of branches')),

2645

('C', 'clean', None, _('overwrite locally modified files')),

2645

('C', 'clean', None, _('overwrite locally modified files')),

2646

('f', 'force', None, _('force a merge with outstanding changes'))],

2646

('f', 'force', None, _('force a merge with outstanding changes'))],

2647

_('hg update [-b TAG] [-m] [-C] [-f] [REV]')),

2647

_('hg update [-b TAG] [-m] [-C] [-f] [REV]')),

2648

"verify": (verify, [], _('hg verify')),

2648

"verify": (verify, [], _('hg verify')),

2649

"version": (show_version, [], _('hg version')),

2649

"version": (show_version, [], _('hg version')),

2650

}

2650

}

2651

2652

globalopts = [

2652

globalopts = [

2653

('R', 'repository', '', _('repository root directory')),

2653

('R', 'repository', '', _('repository root directory')),

2654

('', 'cwd', '', _('change working directory')),

2654

('', 'cwd', '', _('change working directory')),

2655

('y', 'noninteractive', None,

2655

('y', 'noninteractive', None,

2656

_('do not prompt, assume \'yes\' for any required answers')),

2656

_('do not prompt, assume \'yes\' for any required answers')),

2657

('q', 'quiet', None, _('suppress output')),

2657

('q', 'quiet', None, _('suppress output')),

2658

('v', 'verbose', None, _('enable additional output')),

2658

('v', 'verbose', None, _('enable additional output')),

2659

('', 'debug', None, _('enable debugging output')),

2659

('', 'debug', None, _('enable debugging output')),

2660

('', 'debugger', None, _('start debugger')),

2660

('', 'debugger', None, _('start debugger')),

2661

('', 'traceback', None, _('print traceback on exception')),

2661

('', 'traceback', None, _('print traceback on exception')),

2662

('', 'time', None, _('time how long the command takes')),

2662

('', 'time', None, _('time how long the command takes')),

2663

('', 'profile', None, _('print command execution profile')),

2663

('', 'profile', None, _('print command execution profile')),

2664

('', 'version', None, _('output version information and exit')),

2664

('', 'version', None, _('output version information and exit')),

2665

('h', 'help', None, _('display help and exit')),

2665

('h', 'help', None, _('display help and exit')),

2666

]

2666

]

2667

2668

norepo = ("clone init version help debugancestor debugcomplete debugdata"

2668

norepo = ("clone init version help debugancestor debugcomplete debugdata"

2669

" debugindex debugindexdot")

2669

" debugindex debugindexdot")

2670

optionalrepo = ("paths debugconfig")

2670

optionalrepo = ("paths debugconfig")

2671

2672

def findpossible(cmd):

2672

def findpossible(cmd):

2673

"""

2673

"""

2674

Return cmd -> (aliases, command table entry)

2674

Return cmd -> (aliases, command table entry)

2675

for each matching command

2675

for each matching command

2676

"""

2676

"""

2677

choice = {}

2677

choice = {}

2678

debugchoice = {}

2678

debugchoice = {}

2679

for e in table.keys():

2679

for e in table.keys():

2680

aliases = e.lstrip("^").split("|")

2680

aliases = e.lstrip("^").split("|")

2681

if cmd in aliases:

2681

if cmd in aliases:

2682

choice[cmd] = (aliases, table[e])

2682

choice[cmd] = (aliases, table[e])

2683

continue

2683

continue

2684

for a in aliases:

2684

for a in aliases:

2685

if a.startswith(cmd):

2685

if a.startswith(cmd):

2686

if aliases[0].startswith("debug"):

2686

if aliases[0].startswith("debug"):

2687

debugchoice[a] = (aliases, table[e])

2687

debugchoice[a] = (aliases, table[e])

2688

else:

2688

else:

2689

choice[a] = (aliases, table[e])

2689

choice[a] = (aliases, table[e])

2690

break

2690

break

2691

2692

if not choice and debugchoice:

2692

if not choice and debugchoice:

2693

choice = debugchoice

2693

choice = debugchoice

2694

2695

return choice

2695

return choice

2696

2697

def find(cmd):

2697

def find(cmd):

2698

"""Return (aliases, command table entry) for command string."""

2698

"""Return (aliases, command table entry) for command string."""

2699

choice = findpossible(cmd)

2699

choice = findpossible(cmd)

2700

2701

if choice.has_key(cmd):

2701

if choice.has_key(cmd):

2702

return choice[cmd]

2702

return choice[cmd]

2703

2704

if len(choice) > 1:

2704

if len(choice) > 1:

2705

clist = choice.keys()

2705

clist = choice.keys()

2706

clist.sort()

2706

clist.sort()

2707

raise AmbiguousCommand(cmd, clist)

2707

raise AmbiguousCommand(cmd, clist)

2708

2709

if choice:

2709

if choice:

2710

return choice.values()[0]

2710

return choice.values()[0]

2711

2712

raise UnknownCommand(cmd)

2712

raise UnknownCommand(cmd)

2713

2714

class SignalInterrupt(Exception):

2714

class SignalInterrupt(Exception):

2715

"""Exception raised on SIGTERM and SIGHUP."""

2715

"""Exception raised on SIGTERM and SIGHUP."""

2716

2717

def catchterm(*args):

2717

def catchterm(*args):

2718

raise SignalInterrupt

2718

raise SignalInterrupt

2719

2720

def run():

2720

def run():

2721

sys.exit(dispatch(sys.argv[1:]))

2721

sys.exit(dispatch(sys.argv[1:]))

2722

2723

class ParseError(Exception):

2723

class ParseError(Exception):

2724

"""Exception raised on errors in parsing the command line."""

2724

"""Exception raised on errors in parsing the command line."""

2725

2726

def parse(ui, args):

2726

def parse(ui, args):

2727

options = {}

2727

options = {}

2728

cmdoptions = {}

2728

cmdoptions = {}

2729

2730

try:

2730

try:

2731

args = fancyopts.fancyopts(args, globalopts, options)

2731

args = fancyopts.fancyopts(args, globalopts, options)

2732

except fancyopts.getopt.GetoptError, inst:

2732

except fancyopts.getopt.GetoptError, inst:

2733

raise ParseError(None, inst)

2733

raise ParseError(None, inst)

2734

2735

if args:

2735

if args:

2736

cmd, args = args[0], args[1:]

2736

cmd, args = args[0], args[1:]

2737

aliases, i = find(cmd)

2737

aliases, i = find(cmd)

2738

cmd = aliases[0]

2738

cmd = aliases[0]

2739

defaults = ui.config("defaults", cmd)

2739

defaults = ui.config("defaults", cmd)

2740

if defaults:

2740

if defaults:

2741

args = defaults.split() + args

2741

args = defaults.split() + args

2742

c = list(i[1])

2742

c = list(i[1])

2743

else:

2743

else:

2744

cmd = None

2744

cmd = None

2745

c = []

2745

c = []

2746

2747

# combine global options into local

2747

# combine global options into local

2748

for o in globalopts:

2748

for o in globalopts:

2749

c.append((o[0], o[1], options[o[1]], o[3]))

2749

c.append((o[0], o[1], options[o[1]], o[3]))

2750

2751

try:

2751

try:

2752

args = fancyopts.fancyopts(args, c, cmdoptions)

2752

args = fancyopts.fancyopts(args, c, cmdoptions)

2753

except fancyopts.getopt.GetoptError, inst:

2753

except fancyopts.getopt.GetoptError, inst:

2754

raise ParseError(cmd, inst)

2754

raise ParseError(cmd, inst)

2755

2756

# separate global options back out

2756

# separate global options back out

2757

for o in globalopts:

2757

for o in globalopts:

2758

n = o[1]

2758

n = o[1]

2759

options[n] = cmdoptions[n]

2759

options[n] = cmdoptions[n]

2760

del cmdoptions[n]

2760

del cmdoptions[n]

2761

2762

return (cmd, cmd and i[0] or None, args, options, cmdoptions)

2762

return (cmd, cmd and i[0] or None, args, options, cmdoptions)

2763

2764

def dispatch(args):

2764

def dispatch(args):

2765

signal.signal(signal.SIGTERM, catchterm)

2765

signal.signal(signal.SIGTERM, catchterm)

2766

try:

2766

try:

2767

signal.signal(signal.SIGHUP, catchterm)

2767

signal.signal(signal.SIGHUP, catchterm)

2768

except AttributeError:

2768

except AttributeError:

2769

pass

2769

pass

2770

2771

try:

2771

try:

2772

u = ui.ui()

2772

u = ui.ui()

2773

except util.Abort, inst:

2773

except util.Abort, inst:

2774

sys.stderr.write(_("abort: %s\n") % inst)

2774

sys.stderr.write(_("abort: %s\n") % inst)

2775

sys.exit(1)

2775

sys.exit(1)

2776

2777

external = []

2777

external = []

2778

for x in u.extensions():

2778

for x in u.extensions():

2779

def on_exception(exc, inst):

2779

def on_exception(exc, inst):

2780

u.warn(_("*** failed to import extension %s\n") % x[1])

2780

u.warn(_("*** failed to import extension %s\n") % x[1])

2781

u.warn("%s\n" % inst)

2781

u.warn("%s\n" % inst)

2782

if "--traceback" in sys.argv[1:]:

2782

if "--traceback" in sys.argv[1:]:

2783

traceback.print_exc()

2783

traceback.print_exc()

2784

if x[1]:

2784

if x[1]:

2785

try:

2785

try:

2786

mod = imp.load_source(x[0], x[1])

2786

mod = imp.load_source(x[0], x[1])

2787

except Exception, inst:

2787

except Exception, inst:

2788

on_exception(Exception, inst)

2788

on_exception(Exception, inst)

2789

continue

2789

continue

2790

else:

2790

else:

2791

def importh(name):

2791

def importh(name):

2792

mod = __import__(name)

2792

mod = __import__(name)

2793

components = name.split('.')

2793

components = name.split('.')

2794

for comp in components[1:]:

2794

for comp in components[1:]:

2795

mod = getattr(mod, comp)

2795

mod = getattr(mod, comp)

2796

return mod

2796

return mod

2797

try:

2797

try:

2798

try:

2799

mod = importh("hgext." + x[0])

2800

except ImportError:

2798

mod = importh(x[0])

2801

mod = importh(x[0])

2799

except Exception, inst:

2802

except Exception, inst:

2800

on_exception(Exception, inst)

2803

on_exception(Exception, inst)

2801

continue

2804

continue

2802

2805

2803

external.append(mod)

2806

external.append(mod)

2804

for x in external:

2807

for x in external:

2805

cmdtable = getattr(x, 'cmdtable', {})

2808

cmdtable = getattr(x, 'cmdtable', {})

2806

for t in cmdtable:

2809

for t in cmdtable:

2807

if t in table:

2810

if t in table:

2808

u.warn(_("module %s overrides %s\n") % (x.__name__, t))

2811

u.warn(_("module %s overrides %s\n") % (x.__name__, t))

2809

table.update(cmdtable)

2812

table.update(cmdtable)

2810

2813

2811

try:

2814

try:

2812

cmd, func, args, options, cmdoptions = parse(u, args)

2815

cmd, func, args, options, cmdoptions = parse(u, args)

2813

if options["time"]:

2816

if options["time"]:

2814

def get_times():

2817

def get_times():

2815

t = os.times()

2818

t = os.times()

2816

if t[4] == 0.0: # Windows leaves this as zero, so use time.clock()

2819

if t[4] == 0.0: # Windows leaves this as zero, so use time.clock()

2817

t = (t[0], t[1], t[2], t[3], time.clock())

2820

t = (t[0], t[1], t[2], t[3], time.clock())

2818

return t

2821

return t

2819

s = get_times()

2822

s = get_times()

2820

def print_time():

2823

def print_time():

2821

t = get_times()

2824

t = get_times()

2822

u.warn(_("Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n") %

2825

u.warn(_("Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n") %

2823

(t[4]-s[4], t[0]-s[0], t[2]-s[2], t[1]-s[1], t[3]-s[3]))

2826

(t[4]-s[4], t[0]-s[0], t[2]-s[2], t[1]-s[1], t[3]-s[3]))

2824

atexit.register(print_time)

2827

atexit.register(print_time)

2825

2828

2826

u.updateopts(options["verbose"], options["debug"], options["quiet"],

2829

u.updateopts(options["verbose"], options["debug"], options["quiet"],

2827

not options["noninteractive"])

2830

not options["noninteractive"])

2828

2831

2829

# enter the debugger before command execution

2832

# enter the debugger before command execution

2830

if options['debugger']:

2833

if options['debugger']:

2831

pdb.set_trace()

2834

pdb.set_trace()

2832

2835

2833

try:

2836

try:

2834

if options['cwd']:

2837

if options['cwd']:

2835

try:

2838

try:

2836

os.chdir(options['cwd'])

2839

os.chdir(options['cwd'])

2837

except OSError, inst:

2840

except OSError, inst:

2838

raise util.Abort('%s: %s' %

2841

raise util.Abort('%s: %s' %

2839

(options['cwd'], inst.strerror))

2842

(options['cwd'], inst.strerror))

2840

2843

2841

path = options["repository"] or ""

2844

path = options["repository"] or ""

2842

repo = path and hg.repository(u, path=path) or None

2845

repo = path and hg.repository(u, path=path) or None

2843

2846

2844

if options['help']:

2847

if options['help']:

2845

help_(u, cmd, options['version'])

2848

help_(u, cmd, options['version'])

2846

sys.exit(0)

2849

sys.exit(0)

2847

elif options['version']:

2850

elif options['version']:

2848

show_version(u)

2851

show_version(u)

2849

sys.exit(0)

2852

sys.exit(0)

2850

elif not cmd:

2853

elif not cmd:

2851

help_(u, 'shortlist')

2854

help_(u, 'shortlist')

2852

sys.exit(0)

2855

sys.exit(0)

2853

2856

2854

if cmd not in norepo.split():

2857

if cmd not in norepo.split():

2855

try:

2858

try:

2856

if not repo:

2859

if not repo:

2857

repo = hg.repository(u, path=path)

2860

repo = hg.repository(u, path=path)

2858

u = repo.ui

2861

u = repo.ui

2859

for x in external:

2862

for x in external:

2860

if hasattr(x, 'reposetup'):

2863

if hasattr(x, 'reposetup'):

2861

x.reposetup(u, repo)

2864

x.reposetup(u, repo)

2862

except hg.RepoError:

2865

except hg.RepoError:

2863

if cmd not in optionalrepo.split():

2866

if cmd not in optionalrepo.split():

2864

raise

2867

raise

2865

d = lambda: func(u, repo, *args, **cmdoptions)

2868

d = lambda: func(u, repo, *args, **cmdoptions)

2866

else:

2869

else:

2867

d = lambda: func(u, *args, **cmdoptions)

2870

d = lambda: func(u, *args, **cmdoptions)

2868

2871

2869

try:

2872

try:

2870

if options['profile']:

2873

if options['profile']:

2871

import hotshot, hotshot.stats

2874

import hotshot, hotshot.stats

2872

prof = hotshot.Profile("hg.prof")

2875

prof = hotshot.Profile("hg.prof")

2873

try:

2876

try:

2874

try:

2877

try:

2875

return prof.runcall(d)

2878

return prof.runcall(d)

2876

except:

2879

except:

2877

try:

2880

try:

2878

u.warn(_('exception raised - generating '

2881

u.warn(_('exception raised - generating '

2879

'profile anyway\n'))

2882

'profile anyway\n'))

2880

except:

2883

except:

2881

pass

2884

pass

2882

raise

2885

raise

2883

finally:

2886

finally:

2884

prof.close()

2887

prof.close()

2885

stats = hotshot.stats.load("hg.prof")

2888

stats = hotshot.stats.load("hg.prof")

2886

stats.strip_dirs()

2889

stats.strip_dirs()

2887

stats.sort_stats('time', 'calls')

2890

stats.sort_stats('time', 'calls')

2888

stats.print_stats(40)

2891

stats.print_stats(40)

2889

else:

2892

else:

2890

return d()

2893

return d()

2891

finally:

2894

finally:

2892

u.flush()

2895

u.flush()

2893

except:

2896

except:

2894

# enter the debugger when we hit an exception

2897

# enter the debugger when we hit an exception

2895

if options['debugger']:

2898

if options['debugger']:

2896

pdb.post_mortem(sys.exc_info()[2])

2899

pdb.post_mortem(sys.exc_info()[2])

2897

if options['traceback']:

2900

if options['traceback']:

2898

traceback.print_exc()

2901

traceback.print_exc()

2899

raise

2902

raise

2900

except ParseError, inst:

2903

except ParseError, inst:

2901

if inst.args[0]:

2904

if inst.args[0]:

2902

u.warn(_("hg %s: %s\n") % (inst.args[0], inst.args[1]))

2905

u.warn(_("hg %s: %s\n") % (inst.args[0], inst.args[1]))

2903

help_(u, inst.args[0])

2906

help_(u, inst.args[0])

2904

else:

2907

else:

2905

u.warn(_("hg: %s\n") % inst.args[1])

2908

u.warn(_("hg: %s\n") % inst.args[1])

2906

help_(u, 'shortlist')

2909

help_(u, 'shortlist')

2907

sys.exit(-1)

2910

sys.exit(-1)

2908

except AmbiguousCommand, inst:

2911

except AmbiguousCommand, inst:

2909

u.warn(_("hg: command '%s' is ambiguous:\n %s\n") %

2912

u.warn(_("hg: command '%s' is ambiguous:\n %s\n") %

2910

(inst.args[0], " ".join(inst.args[1])))

2913

(inst.args[0], " ".join(inst.args[1])))

2911

sys.exit(1)

2914

sys.exit(1)

2912

except UnknownCommand, inst:

2915

except UnknownCommand, inst:

2913

u.warn(_("hg: unknown command '%s'\n") % inst.args[0])

2916

u.warn(_("hg: unknown command '%s'\n") % inst.args[0])

2914

help_(u, 'shortlist')

2917

help_(u, 'shortlist')

2915

sys.exit(1)

2918

sys.exit(1)

2916

except hg.RepoError, inst:

2919

except hg.RepoError, inst:

2917

u.warn(_("abort: "), inst, "!\n")

2920

u.warn(_("abort: "), inst, "!\n")

2918

except revlog.RevlogError, inst:

2921

except revlog.RevlogError, inst:

2919

u.warn(_("abort: "), inst, "!\n")

2922

u.warn(_("abort: "), inst, "!\n")

2920

except SignalInterrupt:

2923

except SignalInterrupt:

2921

u.warn(_("killed!\n"))

2924

u.warn(_("killed!\n"))

2922

except KeyboardInterrupt:

2925

except KeyboardInterrupt:

2923

try:

2926

try:

2924

u.warn(_("interrupted!\n"))

2927

u.warn(_("interrupted!\n"))

2925

except IOError, inst:

2928

except IOError, inst:

2926

if inst.errno == errno.EPIPE:

2929

if inst.errno == errno.EPIPE:

2927

if u.debugflag:

2930

if u.debugflag:

2928

u.warn(_("\nbroken pipe\n"))

2931

u.warn(_("\nbroken pipe\n"))

2929

else:

2932

else:

2930

raise

2933

raise

2931

except IOError, inst:

2934

except IOError, inst:

2932

if hasattr(inst, "code"):

2935

if hasattr(inst, "code"):

2933

u.warn(_("abort: %s\n") % inst)

2936

u.warn(_("abort: %s\n") % inst)

2934

elif hasattr(inst, "reason"):

2937

elif hasattr(inst, "reason"):

2935

u.warn(_("abort: error: %s\n") % inst.reason[1])

2938

u.warn(_("abort: error: %s\n") % inst.reason[1])

2936

elif hasattr(inst, "args") and inst[0] == errno.EPIPE:

2939

elif hasattr(inst, "args") and inst[0] == errno.EPIPE:

2937

if u.debugflag:

2940

if u.debugflag:

2938

u.warn(_("broken pipe\n"))

2941

u.warn(_("broken pipe\n"))

2939

elif getattr(inst, "strerror", None):

2942

elif getattr(inst, "strerror", None):

2940

if getattr(inst, "filename", None):

2943

if getattr(inst, "filename", None):

2941

u.warn(_("abort: %s - %s\n") % (inst.strerror, inst.filename))

2944

u.warn(_("abort: %s - %s\n") % (inst.strerror, inst.filename))

2942

else:

2945

else:

2943

u.warn(_("abort: %s\n") % inst.strerror)

2946

u.warn(_("abort: %s\n") % inst.strerror)

2944

else:

2947

else:

2945

raise

2948

raise

2946

except OSError, inst:

2949

except OSError, inst:

2947

if hasattr(inst, "filename"):

2950

if hasattr(inst, "filename"):

2948

u.warn(_("abort: %s: %s\n") % (inst.strerror, inst.filename))

2951

u.warn(_("abort: %s: %s\n") % (inst.strerror, inst.filename))

2949

else:

2952

else:

2950

u.warn(_("abort: %s\n") % inst.strerror)

2953

u.warn(_("abort: %s\n") % inst.strerror)

2951

except util.Abort, inst:

2954

except util.Abort, inst:

2952

u.warn(_('abort: '), inst.args[0] % inst.args[1:], '\n')

2955

u.warn(_('abort: '), inst.args[0] % inst.args[1:], '\n')

2953

sys.exit(1)

2956

sys.exit(1)

2954

except TypeError, inst:

2957

except TypeError, inst:

2955

# was this an argument error?

2958

# was this an argument error?

2956

tb = traceback.extract_tb(sys.exc_info()[2])

2959

tb = traceback.extract_tb(sys.exc_info()[2])

2957

if len(tb) > 2: # no

2960

if len(tb) > 2: # no

2958

raise

2961

raise

2959

u.debug(inst, "\n")

2962

u.debug(inst, "\n")

2960

u.warn(_("%s: invalid arguments\n") % cmd)

2963

u.warn(_("%s: invalid arguments\n") % cmd)

2961

help_(u, cmd)

2964

help_(u, cmd)

2962

except SystemExit:

2965

except SystemExit:

2963

# don't catch this in the catch-all below

2966

# don't catch this in the catch-all below

2964

raise

2967

raise

2965

except:

2968

except:

2966

u.warn(_("** unknown exception encountered, details follow\n"))

2969

u.warn(_("** unknown exception encountered, details follow\n"))

2967

u.warn(_("** report bug details to mercurial@selenic.com\n"))

2970

u.warn(_("** report bug details to mercurial@selenic.com\n"))

2968

u.warn(_("** Mercurial Distributed SCM (version %s)\n")

2971

u.warn(_("** Mercurial Distributed SCM (version %s)\n")

2969

% version.get_version())

2972

% version.get_version())

2970

raise

2973

raise

2971

2974

2972

sys.exit(-1)

2975

sys.exit(-1)

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

             # commands.py - command processing for mercurial
             #
             # Copyright 2005 Matt Mackall <mpm@selenic.com>
             #
             # This software may be used and distributed according to the terms
             # of the GNU General Public License, incorporated herein by reference.
             from demandload import demandload
             from node import *
             from i18n import gettext as _
             demandload(globals(), "os re sys signal shutil imp urllib pdb")
             demandload(globals(), "fancyopts ui hg util lock revlog")
             demandload(globals(), "fnmatch hgweb mdiff random signal time traceback")
             demandload(globals(), "errno socket version struct atexit sets bz2")
             class UnknownCommand(Exception):
                 """Exception raised if command is not in the command table."""
             class AmbiguousCommand(Exception):
                 """Exception raised if command shortcut matches more than one command."""
             def filterfiles(filters, files):
                 l = [x for x in files if x in filters]
                 for t in filters:
                     if t and t[-1] != "/":
                         t += "/"
                     l += [x for x in files if x.startswith(t)]
                 return l
             def relpath(repo, args):
                 cwd = repo.getcwd()
                 if cwd:
                     return [util.normpath(os.path.join(cwd, x)) for x in args]
                 return args
             def matchpats(repo, pats=[], opts={}, head=''):
                 cwd = repo.getcwd()
                 if not pats and cwd:
                     opts['include'] = [os.path.join(cwd, i) for i in opts['include']]
                     opts['exclude'] = [os.path.join(cwd, x) for x in opts['exclude']]
                     cwd = ''
                 return util.cmdmatcher(repo.root, cwd, pats or ['.'], opts.get('include'),
                                        opts.get('exclude'), head)
             def makewalk(repo, pats, opts, node=None, head=''):
                 files, matchfn, anypats = matchpats(repo, pats, opts, head)
                 exact = dict(zip(files, files))
                 def walk():
                     for src, fn in repo.walk(node=node, files=files, match=matchfn):
                         yield src, fn, util.pathto(repo.getcwd(), fn), fn in exact
                 return files, matchfn, walk()
             def walk(repo, pats, opts, node=None, head=''):
                 files, matchfn, results = makewalk(repo, pats, opts, node, head)
                 for r in results:
                     yield r
             def walkchangerevs(ui, repo, pats, opts):
                 '''Iterate over files and the revs they changed in.
                 Callers most commonly need to iterate backwards over the history
                 it is interested in.  Doing so has awful (quadratic-looking)
                 performance, so we use iterators in a "windowed" way.
                 We walk a window of revisions in the desired order.  Within the
                 window, we first walk forwards to gather data, then in the desired
                 order (usually backwards) to display it.
                 This function returns an (iterator, getchange, matchfn) tuple.  The
                 getchange function returns the changelog entry for a numeric
                 revision.  The iterator yields 3-tuples.  They will be of one of
                 the following forms:
                 "window", incrementing, lastrev: stepping through a window,
                 positive if walking forwards through revs, last rev in the
                 sequence iterated over - use to reset state for the current window
                 "add", rev, fns: out-of-order traversal of the given file names
                 fns, which changed during revision rev - use to gather data for
                 possible display
                 "iter", rev, None: in-order traversal of the revs earlier iterated
                 over with "add" - use to display data'''
                 def increasing_windows(start, end, windowsize=8, sizelimit=512):
                     if start < end:
                         while start < end:
                             yield start, min(windowsize, end-start)
                             start += windowsize
                             if windowsize < sizelimit:
                                 windowsize *= 2
                     else:
                         while start > end:
                             yield start, min(windowsize, start-end-1)
                             start -= windowsize
                             if windowsize < sizelimit:
                                 windowsize *= 2
                 files, matchfn, anypats = matchpats(repo, pats, opts)
                 if repo.changelog.count() == 0:
                     return [], False, matchfn
                 revs = map(int, revrange(ui, repo, opts['rev'] or ['tip:0']))
                 wanted = {}
                 slowpath = anypats
                 fncache = {}
                 chcache = {}
                 def getchange(rev):
                     ch = chcache.get(rev)
                     if ch is None:
                         chcache[rev] = ch = repo.changelog.read(repo.lookup(str(rev)))
                     return ch
                 if not slowpath and not files:
                     # No files, no patterns.  Display all revs.
                     wanted = dict(zip(revs, revs))
                 if not slowpath:
                     # Only files, no patterns.  Check the history of each file.
                     def filerevgen(filelog):
                         for i, window in increasing_windows(filelog.count()-1, -1):
                             revs = []
                             for j in xrange(i - window, i + 1):
                                 revs.append(filelog.linkrev(filelog.node(j)))
                             revs.reverse()
                             for rev in revs:
                                 yield rev
                     minrev, maxrev = min(revs), max(revs)
                     for file_ in files:
                         filelog = repo.file(file_)
                         # A zero count may be a directory or deleted file, so
                         # try to find matching entries on the slow path.
                         if filelog.count() == 0:
                             slowpath = True
                             break
                         for rev in filerevgen(filelog):
                             if rev <= maxrev:
                                 if rev < minrev:
                                     break
                                 fncache.setdefault(rev, [])
                                 fncache[rev].append(file_)
                                 wanted[rev] = 1
                 if slowpath:
                     # The slow path checks files modified in every changeset.
                     def changerevgen():
                         for i, window in increasing_windows(repo.changelog.count()-1, -1):
                             for j in xrange(i - window, i + 1):
                                 yield j, getchange(j)[3]
                     for rev, changefiles in changerevgen():
                         matches = filter(matchfn, changefiles)
                         if matches:
                             fncache[rev] = matches
                             wanted[rev] = 1
                 def iterate():
                     for i, window in increasing_windows(0, len(revs)):
                         yield 'window', revs[0] < revs[-1], revs[-1]
                         nrevs = [rev for rev in revs[i:i+window]
                                  if rev in wanted]
                         srevs = list(nrevs)
                         srevs.sort()
                         for rev in srevs:
                             fns = fncache.get(rev) or filter(matchfn, getchange(rev)[3])
                             yield 'add', rev, fns
                         for rev in nrevs:
                             yield 'iter', rev, None
                 return iterate(), getchange, matchfn
             revrangesep = ':'
             def revrange(ui, repo, revs, revlog=None):
                 """Yield revision as strings from a list of revision specifications."""
                 if revlog is None:
                     revlog = repo.changelog
                 revcount = revlog.count()
                 def fix(val, defval):
                     if not val:
                         return defval
                     try:
                         num = int(val)
                         if str(num) != val:
                             raise ValueError
                         if num < 0:
                             num += revcount
                         if num < 0:
                             num = 0
                         elif num >= revcount:
                             raise ValueError
                     except ValueError:
                         try:
                             num = repo.changelog.rev(repo.lookup(val))
                         except KeyError:
                             try:
                                 num = revlog.rev(revlog.lookup(val))
                             except KeyError:
                                 raise util.Abort(_('invalid revision identifier %s'), val)
                     return num
                 seen = {}
                 for spec in revs:
                     if spec.find(revrangesep) >= 0:
                         start, end = spec.split(revrangesep, 1)
                         start = fix(start, 0)
                         end = fix(end, revcount - 1)
                         step = start > end and -1 or 1
                         for rev in xrange(start, end+step, step):
                             if rev in seen:
                                 continue
                             seen[rev] = 1
                             yield str(rev)
                     else:
                         rev = fix(spec, None)
                         if rev in seen:
                             continue
                         seen[rev] = 1
                         yield str(rev)
             def make_filename(repo, r, pat, node=None,
                               total=None, seqno=None, revwidth=None, pathname=None):
                 node_expander = {
                     'H': lambda: hex(node),
                     'R': lambda: str(r.rev(node)),
                     'h': lambda: short(node),
                     }
                 expander = {
                     '%': lambda: '%',
                     'b': lambda: os.path.basename(repo.root),
                     }
                 try:
                     if node:
                         expander.update(node_expander)
                     if node and revwidth is not None:
                         expander['r'] = lambda: str(r.rev(node)).zfill(revwidth)
                     if total is not None:
                         expander['N'] = lambda: str(total)
                     if seqno is not None:
                         expander['n'] = lambda: str(seqno)
                     if total is not None and seqno is not None:
                         expander['n'] = lambda:str(seqno).zfill(len(str(total)))
                     if pathname is not None:
                         expander['s'] = lambda: os.path.basename(pathname)
                         expander['d'] = lambda: os.path.dirname(pathname) or '.'
                         expander['p'] = lambda: pathname
                     newname = []
                     patlen = len(pat)
                     i = 0
                     while i < patlen:
                         c = pat[i]
                         if c == '%':
                             i += 1
                             c = pat[i]
                             c = expander[c]()
                         newname.append(c)
                         i += 1
                     return ''.join(newname)
                 except KeyError, inst:
                     raise util.Abort(_("invalid format spec '%%%s' in output file name"),
                                 inst.args[0])
             def make_file(repo, r, pat, node=None,
                           total=None, seqno=None, revwidth=None, mode='wb', pathname=None):
                 if not pat or pat == '-':
                     return 'w' in mode and sys.stdout or sys.stdin
                 if hasattr(pat, 'write') and 'w' in mode:
                     return pat
                 if hasattr(pat, 'read') and 'r' in mode:
                     return pat
                 return open(make_filename(repo, r, pat, node, total, seqno, revwidth,
                                           pathname),
                             mode)
             def dodiff(fp, ui, repo, node1, node2, files=None, match=util.always,
                        changes=None, text=False, opts={}):
                 if not node1:
                     node1 = repo.dirstate.parents()[0]
                 # reading the data for node1 early allows it to play nicely
                 # with repo.changes and the revlog cache.
                 change = repo.changelog.read(node1)
                 mmap = repo.manifest.read(change[0])
                 date1 = util.datestr(change[2])
                 if not changes:
                     changes = repo.changes(node1, node2, files, match=match)
                 modified, added, removed, deleted, unknown = changes
                 if files:
                     modified, added, removed = map(lambda x: filterfiles(files, x),
                                                    (modified, added, removed))
                 if not modified and not added and not removed:
                     return
                 if node2:
                     change = repo.changelog.read(node2)
                     mmap2 = repo.manifest.read(change[0])
                     date2 = util.datestr(change[2])
                     def read(f):
                         return repo.file(f).read(mmap2[f])
                 else:
                     date2 = util.datestr()
                     def read(f):
                         return repo.wread(f)
                 if ui.quiet:
                     r = None
                 else:
                     hexfunc = ui.verbose and hex or short
                     r = [hexfunc(node) for node in [node1, node2] if node]
                 diffopts = ui.diffopts()
                 showfunc = opts.get('show_function') or diffopts['showfunc']
                 ignorews = opts.get('ignore_all_space') or diffopts['ignorews']
                 for f in modified:
                     to = None
                     if f in mmap:
                         to = repo.file(f).read(mmap[f])
                     tn = read(f)
                     fp.write(mdiff.unidiff(to, date1, tn, date2, f, r, text=text,
                                            showfunc=showfunc, ignorews=ignorews))
                 for f in added:
                     to = None
                     tn = read(f)
                     fp.write(mdiff.unidiff(to, date1, tn, date2, f, r, text=text,
                                            showfunc=showfunc, ignorews=ignorews))
                 for f in removed:
                     to = repo.file(f).read(mmap[f])
                     tn = None
                     fp.write(mdiff.unidiff(to, date1, tn, date2, f, r, text=text,
                                            showfunc=showfunc, ignorews=ignorews))
             def trimuser(ui, name, rev, revcache):
                 """trim the name of the user who committed a change"""
                 user = revcache.get(rev)
                 if user is None:
                     user = revcache[rev] = ui.shortuser(name)
                 return user
             def show_changeset(ui, repo, rev=0, changenode=None, brinfo=None):
                 """show a single changeset or file revision"""
                 log = repo.changelog
                 if changenode is None:
                     changenode = log.node(rev)
                 elif not rev:
                     rev = log.rev(changenode)
                 if ui.quiet:
                     ui.write("%d:%s\n" % (rev, short(changenode)))
                     return
                 changes = log.read(changenode)
                 date = util.datestr(changes[2])
                 parents = [(log.rev(p), ui.verbose and hex(p) or short(p))
                            for p in log.parents(changenode)
                            if ui.debugflag or p != nullid]
                 if not ui.debugflag and len(parents) == 1 and parents[0][0] == rev-1:
                     parents = []
                 if ui.verbose:
                     ui.write(_("changeset:   %d:%s\n") % (rev, hex(changenode)))
                 else:
                     ui.write(_("changeset:   %d:%s\n") % (rev, short(changenode)))
                 for tag in repo.nodetags(changenode):
                     ui.status(_("tag:         %s\n") % tag)
                 for parent in parents:
                     ui.write(_("parent:      %d:%s\n") % parent)
                 if brinfo and changenode in brinfo:
                     br = brinfo[changenode]
                     ui.write(_("branch:      %s\n") % " ".join(br))
                 ui.debug(_("manifest:    %d:%s\n") % (repo.manifest.rev(changes[0]),
                                                   hex(changes[0])))
                 ui.status(_("user:        %s\n") % changes[1])
                 ui.status(_("date:        %s\n") % date)
                 if ui.debugflag:
                     files = repo.changes(log.parents(changenode)[0], changenode)
                     for key, value in zip([_("files:"), _("files+:"), _("files-:")], files):
                         if value:
                             ui.note("%-12s %s\n" % (key, " ".join(value)))
                 else:
                     ui.note(_("files:       %s\n") % " ".join(changes[3]))
                 description = changes[4].strip()
                 if description:
                     if ui.verbose:
                         ui.status(_("description:\n"))
                         ui.status(description)
                         ui.status("\n\n")
                     else:
                         ui.status(_("summary:     %s\n") % description.splitlines()[0])
                 ui.status("\n")
             def show_version(ui):
                 """output version and copyright information"""
                 ui.write(_("Mercurial Distributed SCM (version %s)\n")
                          % version.get_version())
                 ui.status(_(
                     "\nCopyright (C) 2005 Matt Mackall <mpm@selenic.com>\n"
                     "This is free software; see the source for copying conditions. "
                     "There is NO\nwarranty; "
                     "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
                 ))
             def help_(ui, cmd=None, with_version=False):
                 """show help for a given command or all commands"""
                 option_lists = []
                 if cmd and cmd != 'shortlist':
                     if with_version:
                         show_version(ui)
                         ui.write('\n')
                     aliases, i = find(cmd)
                     # synopsis
                     ui.write("%s\n\n" % i[2])
                     # description
                     doc = i[0].__doc__
                     if not doc:
                         doc = _("(No help text available)")
                     if ui.quiet:
                         doc = doc.splitlines(0)[0]
                     ui.write("%s\n" % doc.rstrip())
                     if not ui.quiet:
                         # aliases
                         if len(aliases) > 1:
                             ui.write(_("\naliases: %s\n") % ', '.join(aliases[1:]))
                         # options
                         if i[1]:
                             option_lists.append(("options", i[1]))
                 else:
                     # program name
                     if ui.verbose or with_version:
                         show_version(ui)
                     else:
                         ui.status(_("Mercurial Distributed SCM\n"))
                     ui.status('\n')
                     # list of commands
                     if cmd == "shortlist":
                         ui.status(_('basic commands (use "hg help" '
                                     'for the full list or option "-v" for details):\n\n'))
                     elif ui.verbose:
                         ui.status(_('list of commands:\n\n'))
                     else:
                         ui.status(_('list of commands (use "hg help -v" '
                                     'to show aliases and global options):\n\n'))
                     h = {}
                     cmds = {}
                     for c, e in table.items():
                         f = c.split("|")[0]
                         if cmd == "shortlist" and not f.startswith("^"):
                             continue
                         f = f.lstrip("^")
                         if not ui.debugflag and f.startswith("debug"):
                             continue
                         doc = e[0].__doc__
                         if not doc:
                             doc = _("(No help text available)")
                         h[f] = doc.splitlines(0)[0].rstrip()
                         cmds[f] = c.lstrip("^")
                     fns = h.keys()
                     fns.sort()
                     m = max(map(len, fns))
                     for f in fns:
                         if ui.verbose:
                             commands = cmds[f].replace("|",", ")
                             ui.write(" %s:\n      %s\n"%(commands, h[f]))
                         else:
                             ui.write(' %-*s   %s\n' % (m, f, h[f]))
                 # global options
                 if ui.verbose:
                     option_lists.append(("global options", globalopts))
                 # list all option lists
                 opt_output = []
                 for title, options in option_lists:
                     opt_output.append(("\n%s:\n" % title, None))
                     for shortopt, longopt, default, desc in options:
                         opt_output.append(("%2s%s" % (shortopt and "-%s" % shortopt,
                                                       longopt and " --%s" % longopt),
                                            "%s%s" % (desc,
                                                      default
                                                      and _(" (default: %s)") % default
                                                      or "")))
                 if opt_output:
                     opts_len = max([len(line[0]) for line in opt_output if line[1]])
                     for first, second in opt_output:
                         if second:
                             ui.write(" %-*s  %s\n" % (opts_len, first, second))
                         else:
                             ui.write("%s\n" % first)
             # Commands start here, listed alphabetically
             def add(ui, repo, *pats, **opts):
                 """add the specified files on the next commit
                 Schedule files to be version controlled and added to the repository.
                 The files will be added to the repository at the next commit.
                 If no names are given, add all files in the repository.
                 """
                 names = []
                 for src, abs, rel, exact in walk(repo, pats, opts):
                     if exact:
                         if ui.verbose:
                             ui.status(_('adding %s\n') % rel)
                         names.append(abs)
                     elif repo.dirstate.state(abs) == '?':
                         ui.status(_('adding %s\n') % rel)
                         names.append(abs)
                 repo.add(names)
             def addremove(ui, repo, *pats, **opts):
                 """add all new files, delete all missing files
                 Add all new files and remove all missing files from the repository.
                 New files are ignored if they match any of the patterns in .hgignore. As
                 with add, these changes take effect at the next commit.
                 """
                 return addremove_lock(ui, repo, pats, opts)
             def addremove_lock(ui, repo, pats, opts, wlock=None):
                 add, remove = [], []
                 for src, abs, rel, exact in walk(repo, pats, opts):
                     if src == 'f' and repo.dirstate.state(abs) == '?':
                         add.append(abs)
                         if ui.verbose or not exact:
                             ui.status(_('adding %s\n') % ((pats and rel) or abs))
                     if repo.dirstate.state(abs) != 'r' and not os.path.exists(rel):
                         remove.append(abs)
                         if ui.verbose or not exact:
                             ui.status(_('removing %s\n') % ((pats and rel) or abs))
                 repo.add(add, wlock=wlock)
                 repo.remove(remove, wlock=wlock)
             def annotate(ui, repo, *pats, **opts):
                 """show changeset information per file line
                 List changes in files, showing the revision id responsible for each line
                 This command is useful to discover who did a change or when a change took
                 place.
                 Without the -a option, annotate will avoid processing files it
                 detects as binary. With -a, annotate will generate an annotation
                 anyway, probably with undesirable results.
                 """
                 def getnode(rev):
                     return short(repo.changelog.node(rev))
                 ucache = {}
                 def getname(rev):
                     cl = repo.changelog.read(repo.changelog.node(rev))
                     return trimuser(ui, cl[1], rev, ucache)
                 dcache = {}
                 def getdate(rev):
                     datestr = dcache.get(rev)
                     if datestr is None:
                         cl = repo.changelog.read(repo.changelog.node(rev))
                         datestr = dcache[rev] = util.datestr(cl[2])
                     return datestr
                 if not pats:
                     raise util.Abort(_('at least one file name or pattern required'))
                 opmap = [['user', getname], ['number', str], ['changeset', getnode],
                          ['date', getdate]]
                 if not opts['user'] and not opts['changeset'] and not opts['date']:
                     opts['number'] = 1
                 if opts['rev']:
                     node = repo.changelog.lookup(opts['rev'])
                 else:
                     node = repo.dirstate.parents()[0]
                 change = repo.changelog.read(node)
                 mmap = repo.manifest.read(change[0])
                 for src, abs, rel, exact in walk(repo, pats, opts, node=node):
                     f = repo.file(abs)
                     if not opts['text'] and util.binary(f.read(mmap[abs])):
                         ui.write(_("%s: binary file\n") % ((pats and rel) or abs))
                         continue
                     lines = f.annotate(mmap[abs])
                     pieces = []
                     for o, f in opmap:
                         if opts[o]:
                             l = [f(n) for n, dummy in lines]
                             if l:
                                 m = max(map(len, l))
                                 pieces.append(["%*s" % (m, x) for x in l])
                     if pieces:
                         for p, l in zip(zip(*pieces), lines):
                             ui.write("%s: %s" % (" ".join(p), l[1]))
             def bundle(ui, repo, fname, dest="default-push", **opts):
                 """create a changegroup file
                 Generate a compressed changegroup file collecting all changesets
                 not found in the other repository.
                 This file can then be transferred using conventional means and
                 applied to another repository with the unbundle command. This is
                 useful when native push and pull are not available or when
                 exporting an entire repository is undesirable. The standard file
                 extension is ".hg".
                 Unlike import/export, this exactly preserves all changeset
                 contents including permissions, rename data, and revision history.
                 """
                 f = open(fname, "wb")
                 dest = ui.expandpath(dest, repo.root)
                 other = hg.repository(ui, dest)
                 o = repo.findoutgoing(other)
                 cg = repo.changegroup(o, 'bundle')
                 try:
                     f.write("HG10")
                     z = bz2.BZ2Compressor(9)
                     while 1:
                         chunk = cg.read(4096)
                         if not chunk:
                             break
                         f.write(z.compress(chunk))
                     f.write(z.flush())
                 except:
                     os.unlink(fname)
                     raise
             def cat(ui, repo, file1, *pats, **opts):
                 """output the latest or given revisions of files
                 Print the specified files as they were at the given revision.
                 If no revision is given then the tip is used.
                 Output may be to a file, in which case the name of the file is
                 given using a format string.  The formatting rules are the same as
                 for the export command, with the following additions:
                 %s   basename of file being printed
                 %d   dirname of file being printed, or '.' if in repo root
                 %p   root-relative path name of file being printed
                 """
                 mf = {}
                 rev = opts['rev']
                 if rev:
                     node = repo.lookup(rev)
                 else:
                     node = repo.changelog.tip()
                 change = repo.changelog.read(node)
                 mf = repo.manifest.read(change[0])
                 for src, abs, rel, exact in walk(repo, (file1,) + pats, opts, node):
                     r = repo.file(abs)
                     n = mf[abs]
                     fp = make_file(repo, r, opts['output'], node=n, pathname=abs)
                     fp.write(r.read(n))
             def clone(ui, source, dest=None, **opts):
                 """make a copy of an existing repository
                 Create a copy of an existing repository in a new directory.
                 If no destination directory name is specified, it defaults to the
                 basename of the source.
                 The location of the source is added to the new repository's
                 .hg/hgrc file, as the default to be used for future pulls.
                 For efficiency, hardlinks are used for cloning whenever the source
                 and destination are on the same filesystem.  Some filesystems,
                 such as AFS, implement hardlinking incorrectly, but do not report
                 errors.  In these cases, use the --pull option to avoid
                 hardlinking.
                 See pull for valid source format details.
                 """
                 if dest is None:
                     dest = os.path.basename(os.path.normpath(source))
                 if os.path.exists(dest):
                     raise util.Abort(_("destination '%s' already exists"), dest)
                 dest = os.path.realpath(dest)
                 class Dircleanup(object):
                     def __init__(self, dir_):
                         self.rmtree = shutil.rmtree
                         self.dir_ = dir_
                         os.mkdir(dir_)
                     def close(self):
                         self.dir_ = None
                     def __del__(self):
                         if self.dir_:
                             self.rmtree(self.dir_, True)
                 if opts['ssh']:
                     ui.setconfig("ui", "ssh", opts['ssh'])
                 if opts['remotecmd']:
                     ui.setconfig("ui", "remotecmd", opts['remotecmd'])
                 if not os.path.exists(source):
                     source = ui.expandpath(source)
                 d = Dircleanup(dest)
                 abspath = source
                 other = hg.repository(ui, source)
                 copy = False
                 if other.dev() != -1:
                     abspath = os.path.abspath(source)
                     if not opts['pull'] and not opts['rev']:
                         copy = True
                 if copy:
                     try:
                         # we use a lock here because if we race with commit, we
                         # can end up with extra data in the cloned revlogs that's
                         # not pointed to by changesets, thus causing verify to
                         # fail
                         l1 = other.lock()
                     except lock.LockException:
                         copy = False
                 if copy:
                     # we lock here to avoid premature writing to the target
                     os.mkdir(os.path.join(dest, ".hg"))
                     l2 = lock.lock(os.path.join(dest, ".hg", "lock"))
                     files = "data 00manifest.d 00manifest.i 00changelog.d 00changelog.i"
                     for f in files.split():
                         src = os.path.join(source, ".hg", f)
                         dst = os.path.join(dest, ".hg", f)
                         try:
                             util.copyfiles(src, dst)
                         except OSError, inst:
                             if inst.errno != errno.ENOENT:
                                 raise
                     repo = hg.repository(ui, dest)
                 else:
                     revs = None
                     if opts['rev']:
                         if not other.local():
                             error = _("clone -r not supported yet for remote repositories.")
                             raise util.Abort(error)
                         else:
                             revs = [other.lookup(rev) for rev in opts['rev']]
                     repo = hg.repository(ui, dest, create=1)
                     repo.pull(other, heads = revs)
                 f = repo.opener("hgrc", "w", text=True)
                 f.write("[paths]\n")
                 f.write("default = %s\n" % abspath)
                 f.close()
                 if not opts['noupdate']:
                     update(repo.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, wlock):
                 # called with the repo lock held
                 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:
                             restore = repo.dirstate.state(abstarget) == 'r'
                             if restore:
                                 repo.undelete([abstarget], wlock)
                             try:
                                 shutil.copyfile(relsrc, reltarget)
                                 shutil.copymode(relsrc, reltarget)
                                 restore = False
                             finally:
                                 if restore:
                                     repo.remove([abstarget], wlock)
                         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
                     if abstarget != origsrc:
                         repo.copy(origsrc, abstarget, wlock)
                     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.
                 """
                 try:
                     wlock = repo.wlock(0)
                     errs, copied = docopy(ui, repo, pats, opts, wlock)
                 except lock.LockHeld, inst:
                     ui.warn(_("repository lock held by %s\n") % inst.args[0])
                     errs = 1
                 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(), audit=False), index, "")
                 a = r.ancestor(r.lookup(rev1), r.lookup(rev2))
                 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
             def debugcomplete(ui, cmd):
                 """returns the completion list associated with the given command"""
                 clist = findpossible(cmd).keys()
                 clist.sort()
                 ui.write("%s\n" % " ".join(clist))
             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, repo):
                 """show combined config settings from all hgrc files"""
                 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(), audit=False),
                                   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(), audit=False), 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(), audit=False), file_, "")
                 ui.write("digraph G {\n")
                 for i in range(r.count()):
                     e = r.index[i]
                     ui.write("\t%d -> %d\n" % (r.rev(e[4]), i))
                     if e[5] != nullid:
                         ui.write("\t%d -> %d\n" % (r.rev(e[5]), i))
                 ui.write("}\n")
             def debugrename(ui, repo, file, rev=None):
                 """dump rename information"""
                 r = repo.file(relpath(repo, [file])[0])
                 if rev:
                     try:
                         # assume all revision numbers are for changesets
                         n = repo.lookup(rev)
                         change = repo.changelog.read(n)
                         m = repo.manifest.read(change[0])
                         n = m[relpath(repo, [file])[0]]
                     except (hg.RepoError, KeyError):
                         n = r.lookup(rev)
                 else:
                     n = r.tip()
                 m = r.renamed(n)
                 if m:
                     ui.write(_("renamed from %s:%s\n") % (m[0], hex(m[1])))
                 else:
                     ui.write(_("not renamed\n"))
             def debugwalk(ui, repo, *pats, **opts):
                 """show how files match on given patterns"""
                 items = list(walk(repo, pats, opts))
                 if not items:
                     return
                 fmt = '%%s  %%-%ds  %%-%ds  %%s' % (
                     max([len(abs) for (src, abs, rel, exact) in items]),
                     max([len(rel) for (src, abs, rel, exact) in items]))
                 for src, abs, rel, exact in items:
                     line = fmt % (src, abs, rel, exact and 'exact' or '')
                     ui.write("%s\n" % line.rstrip())
             def diff(ui, repo, *pats, **opts):
                 """diff repository (or selected files)
                 Show differences between revisions for the specified files.
                 Differences between files are shown using the unified diff format.
                 When two revision arguments are given, then changes are shown
                 between those revisions. If only one revision is specified then
                 that revision is compared to the working directory, and, when no
                 revisions are specified, the working directory files are compared
                 to its parent.
                 Without the -a option, diff will avoid generating diffs of files
                 it detects as binary. With -a, diff will generate a diff anyway,
                 probably with undesirable results.
                 """
                 node1, node2 = None, None
                 revs = [repo.lookup(x) for x in opts['rev']]
                 if len(revs) > 0:
                     node1 = revs[0]
                 if len(revs) > 1:
                     node2 = revs[1]
                 if len(revs) > 2:
                     raise util.Abort(_("too many revisions to diff"))
                 fns, matchfn, anypats = matchpats(repo, pats, opts)
                 dodiff(sys.stdout, ui, repo, node1, node2, fns, match=matchfn,
                        text=opts['text'], opts=opts)
             def doexport(ui, repo, changeset, seqno, total, revwidth, opts):
                 node = repo.lookup(changeset)
                 parents = [p for p in repo.changelog.parents(node) if p != nullid]
                 if opts['switch_parent']:
                     parents.reverse()
                 prev = (parents and parents[0]) or nullid
                 change = repo.changelog.read(node)
                 fp = make_file(repo, repo.changelog, opts['output'],
                                node=node, total=total, seqno=seqno,
                                revwidth=revwidth)
                 if fp != sys.stdout:
                     ui.note("%s\n" % fp.name)
                 fp.write("# HG changeset patch\n")
                 fp.write("# User %s\n" % change[1])
                 fp.write("# Node ID %s\n" % hex(node))
                 fp.write("# Parent  %s\n" % hex(prev))
                 if len(parents) > 1:
                     fp.write("# Parent  %s\n" % hex(parents[1]))
                 fp.write(change[4].rstrip())
                 fp.write("\n\n")
                 dodiff(fp, ui, repo, prev, node, text=opts['text'])
                 if fp != sys.stdout:
                     fp.close()
             def export(ui, repo, *changesets, **opts):
                 """dump the header and diffs for one or more changesets
                 Print the changeset header and diffs for one or more revisions.
                 The information shown in the changeset header is: author,
                 changeset hash, parent and commit comment.
                 Output may be to a file, in which case the name of the file is
                 given using a format string.  The formatting rules are as follows:
                 %%   literal "%" character
                 %H   changeset hash (40 bytes of hexadecimal)
                 %N   number of patches being generated
                 %R   changeset revision number
                 %b   basename of the exporting repository
                 %h   short-form changeset hash (12 bytes of hexadecimal)
                 %n   zero-padded sequence number, starting at 1
                 %r   zero-padded changeset revision number
                 Without the -a option, export will avoid generating diffs of files
                 it detects as binary. With -a, export will generate a diff anyway,
                 probably with undesirable results.
                 With the --switch-parent option, the diff will be against the second
                 parent. It can be useful to review a merge.
                 """
                 if not changesets:
                     raise util.Abort(_("export requires at least one changeset"))
                 seqno = 0
                 revs = list(revrange(ui, repo, changesets))
                 total = len(revs)
                 revwidth = max(map(len, revs))
                 msg = len(revs) > 1 and _("Exporting patches:\n") or _("Exporting patch:\n")
                 ui.note(msg)
                 for cset in revs:
                     seqno += 1
                     doexport(ui, repo, cset, seqno, total, revwidth, opts)
             def forget(ui, repo, *pats, **opts):
                 """don't add the specified files on the next commit
                 Undo an 'hg add' scheduled for the next commit.
                 """
                 forget = []
                 for src, abs, rel, exact in walk(repo, pats, opts):
                     if repo.dirstate.state(abs) == 'a':
                         forget.append(abs)
                         if ui.verbose or not exact:
                             ui.status(_('forgetting %s\n') % ((pats and rel) or abs))
                 repo.forget(forget)
             def grep(ui, repo, pattern, *pats, **opts):
                 """search for a pattern in specified files and revisions
                 Search revisions of files for a regular expression.
                 This command behaves differently than Unix grep.  It only accepts
                 Python/Perl regexps.  It searches repository history, not the
                 working directory.  It always prints the revision number in which
                 a match appears.
                 By default, grep only prints output for the first revision of a
                 file in which it finds a match.  To get it to print every revision
                 that contains a change in match status ("-" for a match that
                 becomes a non-match, or "+" for a non-match that becomes a match),
                 use the --all flag.
                 """
                 reflags = 0
                 if opts['ignore_case']:
                     reflags |= re.I
                 regexp = re.compile(pattern, reflags)
                 sep, eol = ':', '\n'
                 if opts['print0']:
                     sep = eol = '\0'
                 fcache = {}
                 def getfile(fn):
                     if fn not in fcache:
                         fcache[fn] = repo.file(fn)
                     return fcache[fn]
                 def matchlines(body):
                     begin = 0
                     linenum = 0
                     while True:
                         match = regexp.search(body, begin)
                         if not match:
                             break
                         mstart, mend = match.span()
                         linenum += body.count('\n', begin, mstart) + 1
                         lstart = body.rfind('\n', begin, mstart) + 1 or begin
                         lend = body.find('\n', mend)
                         yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
                         begin = lend + 1
                 class linestate(object):
                     def __init__(self, line, linenum, colstart, colend):
                         self.line = line
                         self.linenum = linenum
                         self.colstart = colstart
                         self.colend = colend
                     def __eq__(self, other):
                         return self.line == other.line
                     def __hash__(self):
                         return hash(self.line)
                 matches = {}
                 def grepbody(fn, rev, body):
                     matches[rev].setdefault(fn, {})
                     m = matches[rev][fn]
                     for lnum, cstart, cend, line in matchlines(body):
                         s = linestate(line, lnum, cstart, cend)
                         m[s] = s
                 # FIXME: prev isn't used, why ?
                 prev = {}
                 ucache = {}
                 def display(fn, rev, states, prevstates):
                     diff = list(sets.Set(states).symmetric_difference(sets.Set(prevstates)))
                     diff.sort(lambda x, y: cmp(x.linenum, y.linenum))
                     counts = {'-': 0, '+': 0}
                     filerevmatches = {}
                     for l in diff:
                         if incrementing or not opts['all']:
                             change = ((l in prevstates) and '-') or '+'
                             r = rev
                         else:
                             change = ((l in states) and '-') or '+'
                             r = prev[fn]
                         cols = [fn, str(rev)]
                         if opts['line_number']:
                             cols.append(str(l.linenum))
                         if opts['all']:
                             cols.append(change)
                         if opts['user']:
                             cols.append(trimuser(ui, getchange(rev)[1], rev,
                                                               ucache))
                         if opts['files_with_matches']:
                             c = (fn, rev)
                             if c in filerevmatches:
                                 continue
                             filerevmatches[c] = 1
                         else:
                             cols.append(l.line)
                         ui.write(sep.join(cols), eol)
                         counts[change] += 1
                     return counts['+'], counts['-']
                 fstate = {}
                 skip = {}
                 changeiter, getchange, matchfn = walkchangerevs(ui, repo, pats, opts)
                 count = 0
                 incrementing = False
                 for st, rev, fns in changeiter:
                     if st == 'window':
                         incrementing = rev
                         matches.clear()
                     elif st == 'add':
                         change = repo.changelog.read(repo.lookup(str(rev)))
                         mf = repo.manifest.read(change[0])
                         matches[rev] = {}
                         for fn in fns:
                             if fn in skip:
                                 continue
                             fstate.setdefault(fn, {})
                             try:
                                 grepbody(fn, rev, getfile(fn).read(mf[fn]))
                             except KeyError:
                                 pass
                     elif st == 'iter':
                         states = matches[rev].items()
                         states.sort()
                         for fn, m in states:
                             if fn in skip:
                                 continue
                             if incrementing or not opts['all'] or fstate[fn]:
                                 pos, neg = display(fn, rev, m, fstate[fn])
                                 count += pos + neg
                                 if pos and not opts['all']:
                                     skip[fn] = True
                             fstate[fn] = m
                             prev[fn] = rev
                 if not incrementing:
                     fstate = fstate.items()
                     fstate.sort()
                     for fn, state in fstate:
                         if fn in skip:
                             continue
                         display(fn, rev, {}, state)
                 return (count == 0 and 1) or 0
             def heads(ui, repo, **opts):
                 """show current repository heads
                 Show all repository head changesets.
                 Repository "heads" are changesets that don't have children
                 changesets. They are where development generally takes place and
                 are the usual targets for update and merge operations.
                 """
                 if opts['rev']:
                     heads = repo.heads(repo.lookup(opts['rev']))
                 else:
                     heads = repo.heads()
                 br = None
                 if opts['branches']:
                     br = repo.branchlookup(heads)
                 for n in heads:
                     show_changeset(ui, repo, changenode=n, brinfo=br)
             def identify(ui, repo):
                 """print information about the working copy
                 Print a short summary of the current state of the repo.
                 This summary identifies the repository state using one or two parent
                 hash identifiers, followed by a "+" if there are uncommitted changes
                 in the working directory, followed by a list of tags for this revision.
                 """
                 parents = [p for p in repo.dirstate.parents() if p != nullid]
                 if not parents:
                     ui.write(_("unknown\n"))
                     return
                 hexfunc = ui.verbose and hex or short
                 modified, added, removed, deleted, unknown = repo.changes()
                 output = ["%s%s" %
                           ('+'.join([hexfunc(parent) for parent in parents]),
                           (modified or added or removed or deleted) and "+" or "")]
                 if not ui.quiet:
                     # multiple tags for a single parent separated by '/'
                     parenttags = ['/'.join(tags)
                                   for tags in map(repo.nodetags, parents) if tags]
                     # tags for multiple parents separated by ' + '
                     if parenttags:
                         output.append(' + '.join(parenttags))
                 ui.write("%s\n" % ' '.join(output))
             def import_(ui, repo, patch1, *patches, **opts):
                 """import an ordered set of patches
                 Import a list of patches and commit them individually.
                 If there are outstanding changes in the working directory, import
                 will abort unless given the -f flag.
                 If a patch looks like a mail message (its first line starts with
                 "From " or looks like an RFC822 header), it will not be applied
                 unless the -f option is used.  The importer neither parses nor
                 discards mail headers, so use -f only to override the "mailness"
                 safety check, not to import a real mail message.
                 """
                 patches = (patch1,) + patches
                 if not opts['force']:
                     modified, added, removed, deleted, unknown = repo.changes()
                     if modified or added or removed or deleted:
                         raise util.Abort(_("outstanding uncommitted changes"))
                 d = opts["base"]
                 strip = opts["strip"]
                 mailre = re.compile(r'(?:From |[\w-]+:)')
                 # attempt to detect the start of a patch
                 # (this heuristic is borrowed from quilt)
                 diffre = re.compile(r'(?:Index:[ \t]|diff[ \t]|RCS file: |' +
                                     'retrieving revision [0-9]+(\.[0-9]+)*$|' +
                                     '(---|\*\*\*)[ \t])')
                 for patch in patches:
                     ui.status(_("applying %s\n") % patch)
                     pf = os.path.join(d, patch)
                     message = []
                     user = None
                     hgpatch = False
                     for line in file(pf):
                         line = line.rstrip()
                         if (not message and not hgpatch and
                                mailre.match(line) and not opts['force']):
                             if len(line) > 35:
                                 line = line[:32] + '...'
                             raise util.Abort(_('first line looks like a '
                                                'mail header: ') + line)
                         if diffre.match(line):
                             break
                         elif hgpatch:
                             # parse values when importing the result of an hg export
                             if line.startswith("# User "):
                                 user = line[7:]
                                 ui.debug(_('User: %s\n') % user)
                             elif not line.startswith("# ") and line:
                                 message.append(line)
                                 hgpatch = False
                         elif line == '# HG changeset patch':
                             hgpatch = True
                             message = []       # We may have collected garbage
                         else:
                             message.append(line)
                     # make sure message isn't empty
                     if not message:
                         message = _("imported patch %s\n") % patch
                     else:
                         message = "%s\n" % '\n'.join(message)
                     ui.debug(_('message:\n%s\n') % message)
                     files = util.patch(strip, pf, ui)
                     if len(files) > 0:
                         addremove(ui, repo, *files)
                     repo.commit(files, message, user)
             def incoming(ui, repo, source="default", **opts):
                 """show new changesets found in source
                 Show new changesets found in the specified repo or the default
                 pull repo. These are the changesets that would be pulled if a pull
                 was requested.
                 Currently only local repositories are supported.
                 """
                 source = ui.expandpath(source, repo.root)
                 other = hg.repository(ui, source)
                 if not other.local():
                     raise util.Abort(_("incoming doesn't work for remote repositories yet"))
                 o = repo.findincoming(other)
                 if not o:
                     return
                 o = other.changelog.nodesbetween(o)[0]
                 if opts['newest_first']:
                     o.reverse()
                 for n in o:
                     parents = [p for p in other.changelog.parents(n) if p != nullid]
                     if opts['no_merges'] and len(parents) == 2:
                         continue
                     show_changeset(ui, other, changenode=n)
                     if opts['patch']:
                         prev = (parents and parents[0]) or nullid
                         dodiff(ui, ui, other, prev, n)
                         ui.write("\n")
             def init(ui, dest="."):
                 """create a new repository in the given directory
                 Initialize a new repository in the given directory.  If the given
                 directory does not exist, it is created.
                 If no directory is given, the current directory is used.
                 """
                 if not os.path.exists(dest):
                     os.mkdir(dest)
                 hg.repository(ui, dest, create=1)
             def locate(ui, repo, *pats, **opts):
                 """locate files matching specific patterns
                 Print all files under Mercurial control whose names match the
                 given patterns.
                 This command searches the current directory and its
                 subdirectories.  To search an entire repository, move to the root
                 of the repository.
                 If no patterns are given to match, this command prints all file
                 names.
                 If you want to feed the output of this command into the "xargs"
                 command, use the "-0" option to both this command and "xargs".
                 This will avoid the problem of "xargs" treating single filenames
                 that contain white space as multiple filenames.
                 """
                 end = opts['print0'] and '\0' or '\n'
                 rev = opts['rev']
                 if rev:
                     node = repo.lookup(rev)
                 else:
                     node = None
                 for src, abs, rel, exact in walk(repo, pats, opts, node=node,
                                                  head='(?:.*/|)'):
                     if not node and repo.dirstate.state(abs) == '?':
                         continue
                     if opts['fullpath']:
                         ui.write(os.path.join(repo.root, abs), end)
                     else:
                         ui.write(((pats and rel) or abs), end)
             def log(ui, repo, *pats, **opts):
                 """show revision history of entire repository or files
                 Print the revision history of the specified files or the entire project.
                 By default this command outputs: changeset id and hash, tags,
                 non-trivial parents, user, date and time, and a summary for each
                 commit. When the -v/--verbose switch is used, the list of changed
                 files and full commit message is shown.
                 """
                 class dui(object):
                     # Implement and delegate some ui protocol.  Save hunks of
                     # output for later display in the desired order.
                     def __init__(self, ui):
                         self.ui = ui
                         self.hunk = {}
                     def bump(self, rev):
                         self.rev = rev
                         self.hunk[rev] = []
                     def note(self, *args):
                         if self.verbose:
                             self.write(*args)
                     def status(self, *args):
                         if not self.quiet:
                             self.write(*args)
                     def write(self, *args):
                         self.hunk[self.rev].append(args)
                     def debug(self, *args):
                         if self.debugflag:
                             self.write(*args)
                     def __getattr__(self, key):
                         return getattr(self.ui, key)
                 changeiter, getchange, matchfn = walkchangerevs(ui, repo, pats, opts)
                 if opts['limit']:
                     try:
                         limit = int(opts['limit'])
                     except ValueError:
                         raise util.Abort(_('limit must be a positive integer'))
                     if limit <= 0: raise util.Abort(_('limit must be positive'))
                 else:
                     limit = sys.maxint
                 count = 0
                 for st, rev, fns in changeiter:
                     if st == 'window':
                         du = dui(ui)
                     elif st == 'add':
                         du.bump(rev)
                         changenode = repo.changelog.node(rev)
                         parents = [p for p in repo.changelog.parents(changenode)
                                    if p != nullid]
                         if opts['no_merges'] and len(parents) == 2:
                             continue
                         if opts['only_merges'] and len(parents) != 2:
                             continue
                         if opts['keyword']:
                             changes = getchange(rev)
                             miss = 0
                             for k in [kw.lower() for kw in opts['keyword']]:
                                 if not (k in changes[1].lower() or
                                         k in changes[4].lower() or
                                         k in " ".join(changes[3][:20]).lower()):
                                     miss = 1
                                     break
                             if miss:
                                 continue
                         br = None
                         if opts['branches']:
                             br = repo.branchlookup([repo.changelog.node(rev)])
                         show_changeset(du, repo, rev, brinfo=br)
                         if opts['patch']:
                             prev = (parents and parents[0]) or nullid
                             dodiff(du, du, repo, prev, changenode, match=matchfn)
                             du.write("\n\n")
                     elif st == 'iter':
                         if count == limit: break
                         if du.hunk[rev]:
                             count += 1
                             for args in du.hunk[rev]:
                                 ui.write(*args)
             def manifest(ui, repo, rev=None):
                 """output the latest or given revision of the project manifest
                 Print a list of version controlled files for the given revision.
                 The manifest is the list of files being version controlled. If no revision
                 is given then the tip is used.
                 """
                 if rev:
                     try:
                         # assume all revision numbers are for changesets
                         n = repo.lookup(rev)
                         change = repo.changelog.read(n)
                         n = change[0]
                     except hg.RepoError:
                         n = repo.manifest.lookup(rev)
                 else:
                     n = repo.manifest.tip()
                 m = repo.manifest.read(n)
                 mf = repo.manifest.readflags(n)
                 files = m.keys()
                 files.sort()
                 for f in files:
                     ui.write("%40s %3s %s\n" % (hex(m[f]), mf[f] and "755" or "644", f))
             def outgoing(ui, repo, dest="default-push", **opts):
                 """show changesets not found in destination
                 Show changesets not found in the specified destination repo or the
                 default push repo. These are the changesets that would be pushed
                 if a push was requested.
                 See pull for valid source format details.
                 """
                 dest = ui.expandpath(dest, repo.root)
                 other = hg.repository(ui, dest)
                 o = repo.findoutgoing(other)
                 o = repo.changelog.nodesbetween(o)[0]
                 if opts['newest_first']:
                     o.reverse()
                 for n in o:
                     parents = [p for p in repo.changelog.parents(n) if p != nullid]
                     if opts['no_merges'] and len(parents) == 2:
                         continue
                     show_changeset(ui, repo, changenode=n)
                     if opts['patch']:
                         prev = (parents and parents[0]) or nullid
                         dodiff(ui, ui, repo, prev, n)
                         ui.write("\n")
             def parents(ui, repo, rev=None, branches=None):
                 """show the parents of the working dir or revision
                 Print the working directory's parent revisions.
                 """
                 if rev:
                     p = repo.changelog.parents(repo.lookup(rev))
                 else:
                     p = repo.dirstate.parents()
                 br = None
                 if branches is not None:
                     br = repo.branchlookup(p)
                 for n in p:
                     if n != nullid:
                         show_changeset(ui, repo, changenode=n, brinfo=br)
             def paths(ui, repo, 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.
                 """
                 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)
                 (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 and not opts['force']:
                         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.
                 """
                 try:
                     wlock = repo.wlock(0)
                     errs, copied = docopy(ui, repo, pats, opts, wlock)
                     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, True, wlock)
                 except lock.LockHeld, inst:
                     ui.warn(_("repository lock held by %s\n") % inst.args[0])
                     errs = 1
                 return errs
             def revert(ui, repo, *pats, **opts):
                 """revert modified files or dirs back to their unmodified states
                 In its default mode, it reverts any uncommitted modifications made
                 to the named files or directories.  This restores the contents of
                 the affected files to an unmodified state.
                 Using the -r option, it reverts the given files or directories to
                 their state as of an earlier revision.  This can be helpful to "roll
                 back" some or all of a change that should not have been committed.
                 Revert modifies the working directory.  It does not commit any
                 changes, or change the parent of the current working directory.
                 If a file has been deleted, it is recreated.  If the executable
                 mode of a file was changed, it is reset.
                 If names are given, all files matching the names are reverted.
                 If no arguments are given, all files in the repository are reverted.
                 """
                 node = opts['rev'] and repo.lookup(opts['rev']) or \
                        repo.dirstate.parents()[0]
                 files, choose, anypats = matchpats(repo, pats, opts)
                 modified, added, removed, deleted, unknown = repo.changes(match=choose)
                 repo.forget(added)
                 repo.undelete(removed)
                 return repo.update(node, False, True, choose, False)
             def root(ui, repo):
                 """print the root (top) of the current working dir
                 Print the root directory of the current repository.
                 """
                 ui.write(repo.root + "\n")
             def serve(ui, repo, **opts):
                 """export the repository via HTTP
                 Start a local HTTP repository browser and pull server.
                 By default, the server logs accesses to stdout and errors to
                 stderr.  Use the "-A" and "-E" options to log to files.
                 """
                 if opts["stdio"]:
                     fin, fout = sys.stdin, sys.stdout
                     sys.stdout = sys.stderr
                     # Prevent insertion/deletion of CRs
                     util.set_binary(fin)
                     util.set_binary(fout)
                     def getarg():
                         argline = fin.readline()[:-1]
                         arg, l = argline.split()
                         val = fin.read(int(l))
                         return arg, val
                     def respond(v):
                         fout.write("%d\n" % len(v))
                         fout.write(v)
                         fout.flush()
                     lock = None
                     while 1:
                         cmd = fin.readline()[:-1]
                         if cmd == '':
                             return
                         if cmd == "heads":
                             h = repo.heads()
                             respond(" ".join(map(hex, h)) + "\n")
                         if cmd == "lock":
                             lock = repo.lock()
                             respond("")
                         if cmd == "unlock":
                             if lock:
                                 lock.release()
                             lock = None
                             respond("")
                         elif cmd == "branches":
                             arg, nodes = getarg()
                             nodes = map(bin, nodes.split(" "))
                             r = []
                             for b in repo.branches(nodes):
                                 r.append(" ".join(map(hex, b)) + "\n")
                             respond("".join(r))
                         elif cmd == "between":
                             arg, pairs = getarg()
                             pairs = [map(bin, p.split("-")) for p in pairs.split(" ")]
                             r = []
                             for b in repo.between(pairs):
                                 r.append(" ".join(map(hex, b)) + "\n")
                             respond("".join(r))
                         elif cmd == "changegroup":
                             nodes = []
                             arg, roots = getarg()
                             nodes = map(bin, roots.split(" "))
                             cg = repo.changegroup(nodes, 'serve')
                             while 1:
                                 d = cg.read(4096)
                                 if not d:
                                     break
                                 fout.write(d)
                             fout.flush()
                         elif cmd == "addchangegroup":
                             if not lock:
                                 respond("not locked")
                                 continue
                             respond("")
                             r = repo.addchangegroup(fin)
                             respond("")
                 optlist = "name templates style address port ipv6 accesslog errorlog"
                 for o in optlist.split():
                     if opts[o]:
                         ui.setconfig("web", o, opts[o])
                 if opts['daemon'] and not opts['daemon_pipefds']:
                     rfd, wfd = os.pipe()
                     args = sys.argv[:]
                     args.append('--daemon-pipefds=%d,%d' % (rfd, wfd))
                     pid = os.spawnvp(os.P_NOWAIT | getattr(os, 'P_DETACH', 0),
                                      args[0], args)
                     os.close(wfd)
                     os.read(rfd, 1)
                     os._exit(0)
                 try:
                     httpd = hgweb.create_server(repo)
                 except socket.error, inst:
                     raise util.Abort(_('cannot start server: ') + inst.args[1])
                 if ui.verbose:
                     addr, port = httpd.socket.getsockname()
                     if addr == '0.0.0.0':
                         addr = socket.gethostname()
                     else:
                         try:
                             addr = socket.gethostbyaddr(addr)[0]
                         except socket.error:
                             pass
                     if port != 80:
                         ui.status(_('listening at http://%s:%d/\n') % (addr, port))
                     else:
                         ui.status(_('listening at http://%s/\n') % addr)
                 if opts['pid_file']:
                     fp = open(opts['pid_file'], 'w')
                     fp.write(str(os.getpid()))
                     fp.close()
                 if opts['daemon_pipefds']:
                     rfd, wfd = [int(x) for x in opts['daemon_pipefds'].split(',')]
                     os.close(rfd)
                     os.write(wfd, 'y')
                     os.close(wfd)
                     sys.stdout.flush()
                     sys.stderr.flush()
                     fd = os.open(util.nulldev, os.O_RDWR)
                     if fd != 0: os.dup2(fd, 0)
                     if fd != 1: os.dup2(fd, 1)
                     if fd != 2: os.dup2(fd, 2)
                     if fd not in (0, 1, 2): os.close(fd)
                 httpd.serve_forever()
             def status(ui, repo, *pats, **opts):
                 """show changed files in the working directory
                 Show changed files in the repository.  If names are
                 given, only files that match are shown.
                 The codes used to show the status of files are:
                 M = modified
                 A = added
                 R = removed
                 ! = deleted, but still tracked
                 ? = not tracked
                 """
                 files, matchfn, anypats = matchpats(repo, pats, opts)
                 cwd = (pats and repo.getcwd()) or ''
                 modified, added, removed, deleted, unknown = [
                     [util.pathto(cwd, x) for x in n]
                     for n in repo.changes(files=files, match=matchfn)]
                 changetypes = [(_('modified'), 'M', modified),
                                (_('added'), 'A', added),
                                (_('removed'), 'R', removed),
                                (_('deleted'), '!', deleted),
                                (_('unknown'), '?', unknown)]
                 end = opts['print0'] and '\0' or '\n'
                 for opt, char, changes in ([ct for ct in changetypes if opts[ct[0]]]
                                            or changetypes):
                     if opts['no_status']:
                         format = "%%s%s" % end
                     else:
                         format = "%s %%s%s" % (char, end);
                     for f in changes:
                         ui.write(format % f)
             def tag(ui, repo, name, rev_=None, **opts):
                 """add a tag for the current tip or a given revision
                 Name a particular revision using <name>.
                 Tags are used to name particular revisions of the repository and are
                 very useful to compare different revision, to go back to significant
                 earlier versions or to mark branch points as releases, etc.
                 If no revision is given, the tip is used.
                 To facilitate version control, distribution, and merging of tags,
                 they are stored as a file named ".hgtags" which is managed
                 similarly to other project files and can be hand-edited if
                 necessary.  The file '.hg/localtags' is used for local tags (not
                 shared among repositories).
                 """
                 if name == "tip":
                     raise util.Abort(_("the name 'tip' is reserved"))
                 if rev_ is not None:
                     ui.warn(_("use of 'hg tag NAME [REV]' is deprecated, "
                               "please use 'hg tag [-r REV] NAME' instead\n"))
                     if opts['rev']:
                         raise util.Abort(_("use only one form to specify the revision"))
                 if opts['rev']:
                     rev_ = opts['rev']
                 if rev_:
                     r = hex(repo.lookup(rev_))
                 else:
                     r = hex(repo.changelog.tip())
                 disallowed = (revrangesep, '\r', '\n')
                 for c in disallowed:
                     if name.find(c) >= 0:
                         raise util.Abort(_("%s cannot be used in a tag name") % repr(c))
                 repo.hook('pretag', throw=True, node=r, tag=name,
                           local=int(not not opts['local']))
                 if opts['local']:
                     repo.opener("localtags", "a").write("%s %s\n" % (r, name))
                     repo.hook('tag', node=r, tag=name, local=1)
                     return
                 for x in repo.changes():
                     if ".hgtags" in x:
                         raise util.Abort(_("working copy of .hgtags is changed "
                                            "(please commit .hgtags manually)"))
                 repo.wfile(".hgtags", "ab").write("%s %s\n" % (r, name))
                 if repo.dirstate.state(".hgtags") == '?':
                     repo.add([".hgtags"])
                 message = (opts['message'] or
                            _("Added tag %s for changeset %s") % (name, r))
                 try:
                     repo.commit([".hgtags"], message, opts['user'], opts['date'])
                     repo.hook('tag', node=r, tag=name, local=0)
                 except ValueError, inst:
                     raise util.Abort(str(inst))
             def tags(ui, repo):
                 """list repository tags
                 List the repository tags.
                 This lists both regular and local tags.
                 """
                 l = repo.tagslist()
                 l.reverse()
                 for t, n in l:
                     try:
                         r = "%5d:%s" % (repo.changelog.rev(n), hex(n))
                     except KeyError:
                         r = "    ?:?"
                     ui.write("%-30s %s\n" % (t, r))
             def tip(ui, repo, **opts):
                 """show the tip revision
                 Show the tip revision.
                 """
                 n = repo.changelog.tip()
                 br = None
                 if opts['branches']:
                     br = repo.branchlookup([n])
                 show_changeset(ui, repo, changenode=n, brinfo=br)
                 if opts['patch']:
                     dodiff(ui, ui, repo, repo.changelog.parents(n)[0], n)
             def unbundle(ui, repo, fname, **opts):
                 """apply a changegroup file
                 Apply a compressed changegroup file generated by the bundle
                 command.
                 """
                 f = urllib.urlopen(fname)
                 if f.read(4) != "HG10":
                     raise util.Abort(_("%s: not a Mercurial bundle file") % fname)
                 def bzgenerator(f):
                     zd = bz2.BZ2Decompressor()
                     for chunk in f:
                         yield zd.decompress(chunk)
                 bzgen = bzgenerator(util.filechunkiter(f, 4096))
                 if repo.addchangegroup(util.chunkbuffer(bzgen)):
                     return 1
                 if opts['update']:
                     return update(ui, repo)
                 else:
                     ui.status(_("(run 'hg update' to get a working copy)\n"))
             def undo(ui, repo):
                 """undo the last commit or pull
                 Roll back the last pull or commit transaction on the
                 repository, restoring the project to its earlier state.
                 This command should be used with care. There is only one level of
                 undo and there is no redo.
                 This command is not intended for use on public repositories. Once
                 a change is visible for pull by other users, undoing it locally is
                 ineffective.
                 """
                 repo.undo()
             def update(ui, repo, node=None, merge=False, clean=False, force=None,
                        branch=None):
                 """update or merge working directory
                 Update the working directory to the specified revision.
                 If there are no outstanding changes in the working directory and
                 there is a linear relationship between the current version and the
                 requested version, the result is the requested version.
                 Otherwise the result is a merge between the contents of the
                 current working directory and the requested version. Files that
                 changed between either parent are marked as changed for the next
                 commit and a commit must be performed before any further updates
                 are allowed.
                 By default, update will refuse to run if doing so would require
                 merging or discarding local changes.
                 """
                 if branch:
                     br = repo.branchlookup(branch=branch)
                     found = []
                     for x in br:
                         if branch in br[x]:
                             found.append(x)
                     if len(found) > 1:
                         ui.warn(_("Found multiple heads for %s\n") % branch)
                         for x in found:
                             show_changeset(ui, repo, changenode=x, brinfo=br)
                         return 1
                     if len(found) == 1:
                         node = found[0]
                         ui.warn(_("Using head %s for branch %s\n") % (short(node), branch))
                     else:
                         ui.warn(_("branch %s not found\n") % (branch))
                         return 1
                 else:
                     node = node and repo.lookup(node) or repo.changelog.tip()
                 return repo.update(node, allow=merge, force=clean, forcemerge=force)
             def verify(ui, repo):
                 """verify the integrity of the repository
                 Verify the integrity of the current repository.
                 This will perform an extensive check of the repository's
                 integrity, validating the hashes and checksums of each entry in
                 the changelog, manifest, and tracked files, as well as the
                 integrity of their crosslinks and indices.
                 """
                 return repo.verify()
             # Command options and aliases are listed here, alphabetically
             table = {
                 "^add":
                     (add,
                      [('I', 'include', [], _('include names matching the given patterns')),
                       ('X', 'exclude', [], _('exclude names matching the given patterns'))],
                      _('hg add [OPTION]... [FILE]...')),
                 "addremove":
                     (addremove,
                      [('I', 'include', [], _('include names matching the given patterns')),
                       ('X', 'exclude', [], _('exclude names matching the given patterns'))],
                      _('hg addremove [OPTION]... [FILE]...')),
                 "^annotate":
                     (annotate,
                      [('r', 'rev', '', _('annotate the specified revision')),
                       ('a', 'text', None, _('treat all files as text')),
                       ('u', 'user', None, _('list the author')),
                       ('d', 'date', None, _('list the date')),
                       ('n', 'number', None, _('list the revision number (default)')),
                       ('c', 'changeset', None, _('list the changeset')),
                       ('I', 'include', [], _('include names matching the given patterns')),
                       ('X', 'exclude', [], _('exclude names matching the given patterns'))],
                      _('hg annotate [-r REV] [-a] [-u] [-d] [-n] [-c] FILE...')),
                 "bundle":
                     (bundle,
                      [],
                      _('hg bundle FILE DEST')),
                 "cat":
                     (cat,
                      [('o', 'output', '', _('print output to file with formatted name')),
                       ('r', 'rev', '', _('print the given revision')),
                       ('I', 'include', [], _('include names matching the given patterns')),
                       ('X', 'exclude', [], _('exclude names matching the given patterns'))],
                      _('hg cat [OPTION]... FILE...')),
                 "^clone":
                     (clone,
                      [('U', 'noupdate', None, _('do not update the new working directory')),
                       ('r', 'rev', [],
                        _('a changeset you would like to have after cloning')),
                       ('', 'pull', None, _('use pull protocol to copy metadata')),
                       ('e', 'ssh', '', _('specify ssh command to use')),
                       ('', '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')),
                       ('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')),
                       ('I', 'include', [], _('include names matching the given patterns')),
                       ('X', 'exclude', [], _('exclude names matching the given patterns'))],
                      _('hg commit [OPTION]... [FILE]...')),
                 "copy|cp":
                     (copy,
                      [('A', 'after', None, _('record a copy that has already occurred')),
                       ('f', 'force', None,
                        _('forcibly copy over an existing managed file')),
                       ('I', 'include', [], _('include names matching the given patterns')),
                       ('X', 'exclude', [], _('exclude names matching the given patterns'))],
                      _('hg copy [OPTION]... [SOURCE]... DEST')),
                 "debugancestor": (debugancestor, [], _('debugancestor INDEX REV1 REV2')),
                 "debugcomplete": (debugcomplete, [], _('debugcomplete CMD')),
                 "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')),
                       ('p', 'show-function', None,
                        _('show which function each change is in')),
                       ('w', 'ignore-all-space', None,
                        _('ignore white space when comparing lines')),
                       ('I', 'include', [], _('include names matching the given patterns')),
                       ('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 OUTFILESPEC] 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')),
                       ('', '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')),
                       ('I', 'include', [], _('include names matching the given patterns')),
                       ('X', 'exclude', [], _('exclude names matching the given patterns'))],
                      _('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')),
                       ('b', 'base', '', _('base path')),
                       ('f', 'force', None,
                        _('skip check for outstanding uncommitted changes'))],
                      _('hg import [-p NUM] [-b BASE] [-f] 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,
                      [('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')),
                       ('I', 'include', [], _('include names matching the given patterns')),
                       ('X', 'exclude', [], _('exclude names matching the given patterns'))],
                      _('hg log [OPTION]... [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 [-M] [-p] [-n] [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]')),
                 "debugrawcommit|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 debugrawcommit [OPTION]... [FILE]...')),
                 "recover": (recover, [], _('hg recover')),
                 "^remove|rm":
                     (remove,
                      [('f', 'force', None, _('remove file even if modified')),
                       ('I', 'include', [], _('include names matching the given patterns')),
                       ('X', 'exclude', [], _('exclude names matching the given patterns'))],
                      _('hg remove [OPTION]... FILE...')),
                 "rename|mv":
                     (rename,
                      [('A', 'after', None, _('record a rename that has already occurred')),
                       ('f', 'force', None,
                        _('forcibly copy over an existing managed file')),
                       ('I', 'include', [], _('include names matching the given patterns')),
                       ('X', 'exclude', [], _('exclude names matching the given patterns'))],
                      _('hg rename [OPTION]... SOURCE... DEST')),
                 "^revert":
                     (revert,
                      [('r', 'rev', '', _('revision to revert to')),
                       ('I', 'include', [], _('include names matching the given patterns')),
                       ('X', 'exclude', [], _('exclude names matching the given patterns'))],
                      _('hg revert [-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 [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME')),
                 "tags": (tags, [], _('hg tags')),
                 "tip":
                     (tip,
                      [('b', 'branches', None, _('show branches')),
                       ('p', 'patch', None, _('show patch'))],
                      _('hg tip [-b] [-p]')),
                 "unbundle":
                     (unbundle,
                      [('u', 'update', None,
                        _('update the working directory to tip after unbundle'))],
                      _('hg unbundle [-u] FILE')),
                 "undo": (undo, [], _('hg undo')),
                 "^update|up|checkout|co":
                     (update,
                      [('b', 'branch', '', _('checkout the head of a specific branch')),
                       ('m', 'merge', None, _('allow merging of branches')),
                       ('C', 'clean', None, _('overwrite locally modified files')),
                       ('f', 'force', None, _('force a merge with outstanding changes'))],
                      _('hg update [-b TAG] [-m] [-C] [-f] [REV]')),
                 "verify": (verify, [], _('hg verify')),
                 "version": (show_version, [], _('hg version')),
             }
             globalopts = [
                 ('R', 'repository', '', _('repository root directory')),
                 ('', 'cwd', '', _('change working directory')),
                 ('y', 'noninteractive', None,
                  _('do not prompt, assume \'yes\' for any required answers')),
                 ('q', 'quiet', None, _('suppress output')),
                 ('v', 'verbose', None, _('enable additional output')),
                 ('', 'debug', None, _('enable debugging output')),
                 ('', 'debugger', None, _('start debugger')),
                 ('', 'traceback', None, _('print traceback on exception')),
                 ('', 'time', None, _('time how long the command takes')),
                 ('', 'profile', None, _('print command execution profile')),
                 ('', 'version', None, _('output version information and exit')),
                 ('h', 'help', None, _('display help and exit')),
             ]
             norepo = ("clone init version help debugancestor debugcomplete debugdata"
                       " debugindex debugindexdot")
             optionalrepo = ("paths debugconfig")
             def findpossible(cmd):
                 """
                 Return cmd -> (aliases, command table entry)
                 for each matching command
                 """
                 choice = {}
                 debugchoice = {}
                 for e in table.keys():
                     aliases = e.lstrip("^").split("|")
                     if cmd in aliases:
                         choice[cmd] = (aliases, table[e])
                         continue
                     for a in aliases:
                         if a.startswith(cmd):
                             if aliases[0].startswith("debug"):
                                 debugchoice[a] = (aliases, table[e])
                             else:
                                 choice[a] = (aliases, table[e])
                             break
                 if not choice and debugchoice:
                     choice = debugchoice
                 return choice
             def find(cmd):
                 """Return (aliases, command table entry) for command string."""
                 choice = findpossible(cmd)
                 if choice.has_key(cmd):
                     return choice[cmd]
                 if len(choice) > 1:
                     clist = choice.keys()
                     clist.sort()
                     raise AmbiguousCommand(cmd, clist)
                 if choice:
                     return choice.values()[0]
                 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:
+                            try:
+                                mod = importh("hgext." + x[0])
+                            except ImportError:
                                 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)
                     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:
                         if options['cwd']:
                             try:
                                 os.chdir(options['cwd'])
                             except OSError, inst:
                                 raise util.Abort('%s: %s' %
                                                  (options['cwd'], inst.strerror))
                         path = options["repository"] or ""
                         repo = path and hg.repository(u, path=path) or None
                         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 cmd not in norepo.split():
                             try:
                                 if not repo:
                                     repo = hg.repository(u, path=path)
                                 u = repo.ui
                                 for x in external:
                                     if hasattr(x, 'reposetup'):
                                         x.reposetup(u, repo)
                             except hg.RepoError:
                                 if cmd not in optionalrepo.split():
                                     raise
                             d = lambda: func(u, repo, *args, **cmdoptions)
                         else:
                             d = lambda: func(u, *args, **cmdoptions)
                         try:
                             if options['profile']:
                                 import hotshot, hotshot.stats
                                 prof = hotshot.Profile("hg.prof")
                                 try:
                                     try:
                                         return prof.runcall(d)
                                     except:
                                         try:
                                             u.warn(_('exception raised - generating '
                                                      'profile anyway\n'))
                                         except:
                                             pass
                                         raise
                                 finally:
                                     prof.close()
                                     stats = hotshot.stats.load("hg.prof")
                                     stats.strip_dirs()
                                     stats.sort_stats('time', 'calls')
                                     stats.print_stats(40)
                             else:
                                 return d()
                         finally:
                             u.flush()
                     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 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    %s\n") %
                             (inst.args[0], " ".join(inst.args[1])))
                     sys.exit(1)
                 except UnknownCommand, inst:
                     u.warn(_("hg: unknown command '%s'\n") % inst.args[0])
                     help_(u, 'shortlist')
                     sys.exit(1)
                 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 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)