upstream/mercurial-mirror Commit - r16484:bf877ebe

1

@ (34) head

1

@ (34) head

2

|

2

|

3

| o (33) head

3

| o (33) head

4

| |

4

| |

5

o | (32) expand

5

o | (32) expand

6

|\ \

6

|\ \

7

| o \ (31) expand

7

| o \ (31) expand

8

| |\ \

8

| |\ \

9

| | o \ (30) expand

9

| | o \ (30) expand

10

| | |\ \

10

| | |\ \

11

| | | o | (29) regular commit

11

| | | o | (29) regular commit

12

| | | | |

12

| | | | |

13

| | o | | (28) merge zero known

13

| | o | | (28) merge zero known

14

| | |\ \ \

14

| | |\ \ \

15

o | | | | | (27) collapse

15

o | | | | | (27) collapse

16

|/ / / / /

16

|/ / / / /

17

| | o---+ (26) merge one known; far right

17

| | o---+ (26) merge one known; far right

18

| | | | |

18

| | | | |

19

+---o | | (25) merge one known; far left

19

+---o | | (25) merge one known; far left

20

| | | | |

20

| | | | |

21

| | o | | (24) merge one known; immediate right

21

| | o | | (24) merge one known; immediate right

22

| | |\| |

22

| | |\| |

23

| | o | | (23) merge one known; immediate left

23

| | o | | (23) merge one known; immediate left

24

| |/| | |

24

| |/| | |

25

+---o---+ (22) merge two known; one far left, one far right

25

+---o---+ (22) merge two known; one far left, one far right

26

| | / /

26

| | / /

27

o | | | (21) expand

27

o | | | (21) expand

28

|\ \ \ \

28

|\ \ \ \

29

| o---+-+ (20) merge two known; two far right

29

| o---+-+ (20) merge two known; two far right

30

| / / /

30

| / / /

31

o | | | (19) expand

31

o | | | (19) expand

32

|\ \ \ \

32

|\ \ \ \

33

+---+---o (18) merge two known; two far left

33

+---+---o (18) merge two known; two far left

34

| | | |

34

| | | |

35

| o | | (17) expand

35

| o | | (17) expand

36

| |\ \ \

36

| |\ \ \

37

| | o---+ (16) merge two known; one immediate right, one near right

37

| | o---+ (16) merge two known; one immediate right, one near right

38

| | |/ /

38

| | |/ /

39

o | | | (15) expand

39

o | | | (15) expand

40

|\ \ \ \

40

|\ \ \ \

41

| o-----+ (14) merge two known; one immediate right, one far right

41

| o-----+ (14) merge two known; one immediate right, one far right

42

| |/ / /

42

| |/ / /

43

o | | | (13) expand

43

o | | | (13) expand

44

|\ \ \ \

44

|\ \ \ \

45

+---o | | (12) merge two known; one immediate right, one far left

45

+---o | | (12) merge two known; one immediate right, one far left

46

| | |/ /

46

| | |/ /

47

| o | | (11) expand

47

| o | | (11) expand

48

| |\ \ \

48

| |\ \ \

49

| | o---+ (10) merge two known; one immediate left, one near right

49

| | o---+ (10) merge two known; one immediate left, one near right

50

| |/ / /

50

| |/ / /

51

o | | | (9) expand

51

o | | | (9) expand

52

|\ \ \ \

52

|\ \ \ \

53

| o-----+ (8) merge two known; one immediate left, one far right

53

| o-----+ (8) merge two known; one immediate left, one far right

54

|/ / / /

54

|/ / / /

55

o | | | (7) expand

55

o | | | (7) expand

56

|\ \ \ \

56

|\ \ \ \

57

+---o | | (6) merge two known; one immediate left, one far left

57

+---o | | (6) merge two known; one immediate left, one far left

58

| |/ / /

58

| |/ / /

59

| o | | (5) expand

59

| o | | (5) expand

60

| |\ \ \

60

| |\ \ \

61

| | o | | (4) merge two known; one immediate left, one immediate right

61

| | o | | (4) merge two known; one immediate left, one immediate right

62

| |/|/ /

62

| |/|/ /

63

| o / / (3) collapse

63

| o / / (3) collapse

64

|/ / /

64

|/ / /

65

o / / (2) collapse

65

o / / (2) collapse

66

|/ /

66

|/ /

67

o / (1) collapse

67

o / (1) collapse

68

|/

68

|/

69

o (0) root

69

o (0) root

70

71

72

$ "$TESTDIR/hghave" no-outer-repo || exit 80

72

$ "$TESTDIR/hghave" no-outer-repo || exit 80

73

74

$ commit()

74

$ commit()

75

> {

75

> {

76

> rev=$1

76

> rev=$1

77

> msg=$2

77

> msg=$2

78

> shift 2

78

> shift 2

79

> if [ "$#" -gt 0 ]; then

79

> if [ "$#" -gt 0 ]; then

80

> hg debugsetparents "$@"

80

> hg debugsetparents "$@"

81

> fi

81

> fi

82

> echo $rev > a

82

> echo $rev > a

83

> hg commit -Aqd "$rev 0" -m "($rev) $msg"

83

> hg commit -Aqd "$rev 0" -m "($rev) $msg"

84

> }

84

> }

85

86

$ cat > printrevset.py <<EOF

86

$ cat > printrevset.py <<EOF

87

> from mercurial import extensions, revset, commands

87

> from mercurial import extensions, revset, commands

88

> from hgext import graphlog

88

> from hgext import graphlog

89

>

89

>

90

> def uisetup(ui):

90

> def uisetup(ui):

91

> def printrevset(orig, ui, repo, *pats, **opts):

91

> def printrevset(orig, ui, repo, *pats, **opts):

92

> if opts.get('print_revset'):

92

> if opts.get('print_revset'):

93

> expr = graphlog.getlogrevs(repo, pats, opts)[1]

93

> expr = graphlog.getlogrevs(repo, pats, opts)[1]

94

> if expr:

94

> if expr:

95

> tree = revset.parse(expr)[0]

95

> tree = revset.parse(expr)[0]

96

> else:

96

> else:

97

> tree = []

97

> tree = []

98

> ui.write('%r\n' % (opts.get('rev', []),))

98

> ui.write('%r\n' % (opts.get('rev', []),))

99

> ui.write(revset.prettyformat(tree) + '\n')

99

> ui.write(revset.prettyformat(tree) + '\n')

100

> return 0

100

> return 0

101

> return orig(ui, repo, *pats, **opts)

101

> return orig(ui, repo, *pats, **opts)

102

> entry = extensions.wrapcommand(commands.table, 'log', printrevset)

102

> entry = extensions.wrapcommand(commands.table, 'log', printrevset)

103

> entry[1].append(('', 'print-revset', False,

103

> entry[1].append(('', 'print-revset', False,

104

> 'print generated revset and exit (DEPRECATED)'))

104

> 'print generated revset and exit (DEPRECATED)'))

105

> EOF

105

> EOF

106

107

$ echo "[extensions]" >> $HGRCPATH

107

$ echo "[extensions]" >> $HGRCPATH

108

$ echo "graphlog=" >> $HGRCPATH

108

$ echo "graphlog=" >> $HGRCPATH

109

$ echo "printrevset=`pwd`/printrevset.py" >> $HGRCPATH

109

$ echo "printrevset=`pwd`/printrevset.py" >> $HGRCPATH

110

111

$ hg init repo

111

$ hg init repo

112

$ cd repo

112

$ cd repo

113

114

Empty repo:

114

Empty repo:

115

116

$ hg glog

116

$ hg glog

117

118

119

Building DAG:

119

Building DAG:

120

121

$ commit 0 "root"

121

$ commit 0 "root"

122

$ commit 1 "collapse" 0

122

$ commit 1 "collapse" 0

123

$ commit 2 "collapse" 1

123

$ commit 2 "collapse" 1

124

$ commit 3 "collapse" 2

124

$ commit 3 "collapse" 2

125

$ commit 4 "merge two known; one immediate left, one immediate right" 1 3

125

$ commit 4 "merge two known; one immediate left, one immediate right" 1 3

126

$ commit 5 "expand" 3 4

126

$ commit 5 "expand" 3 4

127

$ commit 6 "merge two known; one immediate left, one far left" 2 5

127

$ commit 6 "merge two known; one immediate left, one far left" 2 5

128

$ commit 7 "expand" 2 5

128

$ commit 7 "expand" 2 5

129

$ commit 8 "merge two known; one immediate left, one far right" 0 7

129

$ commit 8 "merge two known; one immediate left, one far right" 0 7

130

$ commit 9 "expand" 7 8

130

$ commit 9 "expand" 7 8

131

$ commit 10 "merge two known; one immediate left, one near right" 0 6

131

$ commit 10 "merge two known; one immediate left, one near right" 0 6

132

$ commit 11 "expand" 6 10

132

$ commit 11 "expand" 6 10

133

$ commit 12 "merge two known; one immediate right, one far left" 1 9

133

$ commit 12 "merge two known; one immediate right, one far left" 1 9

134

$ commit 13 "expand" 9 11

134

$ commit 13 "expand" 9 11

135

$ commit 14 "merge two known; one immediate right, one far right" 0 12

135

$ commit 14 "merge two known; one immediate right, one far right" 0 12

136

$ commit 15 "expand" 13 14

136

$ commit 15 "expand" 13 14

137

$ commit 16 "merge two known; one immediate right, one near right" 0 1

137

$ commit 16 "merge two known; one immediate right, one near right" 0 1

138

$ commit 17 "expand" 12 16

138

$ commit 17 "expand" 12 16

139

$ commit 18 "merge two known; two far left" 1 15

139

$ commit 18 "merge two known; two far left" 1 15

140

$ commit 19 "expand" 15 17

140

$ commit 19 "expand" 15 17

141

$ commit 20 "merge two known; two far right" 0 18

141

$ commit 20 "merge two known; two far right" 0 18

142

$ commit 21 "expand" 19 20

142

$ commit 21 "expand" 19 20

143

$ commit 22 "merge two known; one far left, one far right" 18 21

143

$ commit 22 "merge two known; one far left, one far right" 18 21

144

$ commit 23 "merge one known; immediate left" 1 22

144

$ commit 23 "merge one known; immediate left" 1 22

145

$ commit 24 "merge one known; immediate right" 0 23

145

$ commit 24 "merge one known; immediate right" 0 23

146

$ commit 25 "merge one known; far left" 21 24

146

$ commit 25 "merge one known; far left" 21 24

147

$ commit 26 "merge one known; far right" 18 25

147

$ commit 26 "merge one known; far right" 18 25

148

$ commit 27 "collapse" 21

148

$ commit 27 "collapse" 21

149

$ commit 28 "merge zero known" 1 26

149

$ commit 28 "merge zero known" 1 26

150

$ commit 29 "regular commit" 0

150

$ commit 29 "regular commit" 0

151

$ commit 30 "expand" 28 29

151

$ commit 30 "expand" 28 29

152

$ commit 31 "expand" 21 30

152

$ commit 31 "expand" 21 30

153

$ commit 32 "expand" 27 31

153

$ commit 32 "expand" 27 31

154

$ commit 33 "head" 18

154

$ commit 33 "head" 18

155

$ commit 34 "head" 32

155

$ commit 34 "head" 32

156

157

158

$ hg glog -q

158

$ hg glog -q

159

@ 34:fea3ac5810e0

159

@ 34:fea3ac5810e0

160

|

160

|

161

| o 33:68608f5145f9

161

| o 33:68608f5145f9

162

| |

162

| |

163

o | 32:d06dffa21a31

163

o | 32:d06dffa21a31

164

|\ \

164

|\ \

165

| o \ 31:621d83e11f67

165

| o \ 31:621d83e11f67

166

| |\ \

166

| |\ \

167

| | o \ 30:6e11cd4b648f

167

| | o \ 30:6e11cd4b648f

168

| | |\ \

168

| | |\ \

169

| | | o | 29:cd9bb2be7593

169

| | | o | 29:cd9bb2be7593

170

| | | | |

170

| | | | |

171

| | o | | 28:44ecd0b9ae99

171

| | o | | 28:44ecd0b9ae99

172

| | |\ \ \

172

| | |\ \ \

173

o | | | | | 27:886ed638191b

173

o | | | | | 27:886ed638191b

174

|/ / / / /

174

|/ / / / /

175

| | o---+ 26:7f25b6c2f0b9

175

| | o---+ 26:7f25b6c2f0b9

176

| | | | |

176

| | | | |

177

+---o | | 25:91da8ed57247

177

+---o | | 25:91da8ed57247

178

| | | | |

178

| | | | |

179

| | o | | 24:a9c19a3d96b7

179

| | o | | 24:a9c19a3d96b7

180

| | |\| |

180

| | |\| |

181

| | o | | 23:a01cddf0766d

181

| | o | | 23:a01cddf0766d

182

| |/| | |

182

| |/| | |

183

+---o---+ 22:e0d9cccacb5d

183

+---o---+ 22:e0d9cccacb5d

184

| | / /

184

| | / /

185

o | | | 21:d42a756af44d

185

o | | | 21:d42a756af44d

186

|\ \ \ \

186

|\ \ \ \

187

| o---+-+ 20:d30ed6450e32

187

| o---+-+ 20:d30ed6450e32

188

| / / /

188

| / / /

189

o | | | 19:31ddc2c1573b

189

o | | | 19:31ddc2c1573b

190

|\ \ \ \

190

|\ \ \ \

191

+---+---o 18:1aa84d96232a

191

+---+---o 18:1aa84d96232a

192

| | | |

192

| | | |

193

| o | | 17:44765d7c06e0

193

| o | | 17:44765d7c06e0

194

| |\ \ \

194

| |\ \ \

195

| | o---+ 16:3677d192927d

195

| | o---+ 16:3677d192927d

196

| | |/ /

196

| | |/ /

197

o | | | 15:1dda3f72782d

197

o | | | 15:1dda3f72782d

198

|\ \ \ \

198

|\ \ \ \

199

| o-----+ 14:8eac370358ef

199

| o-----+ 14:8eac370358ef

200

| |/ / /

200

| |/ / /

201

o | | | 13:22d8966a97e3

201

o | | | 13:22d8966a97e3

202

|\ \ \ \

202

|\ \ \ \

203

+---o | | 12:86b91144a6e9

203

+---o | | 12:86b91144a6e9

204

| | |/ /

204

| | |/ /

205

| o | | 11:832d76e6bdf2

205

| o | | 11:832d76e6bdf2

206

| |\ \ \

206

| |\ \ \

207

| | o---+ 10:74c64d036d72

207

| | o---+ 10:74c64d036d72

208

| |/ / /

208

| |/ / /

209

o | | | 9:7010c0af0a35

209

o | | | 9:7010c0af0a35

210

|\ \ \ \

210

|\ \ \ \

211

| o-----+ 8:7a0b11f71937

211

| o-----+ 8:7a0b11f71937

212

|/ / / /

212

|/ / / /

213

o | | | 7:b632bb1b1224

213

o | | | 7:b632bb1b1224

214

|\ \ \ \

214

|\ \ \ \

215

+---o | | 6:b105a072e251

215

+---o | | 6:b105a072e251

216

| |/ / /

216

| |/ / /

217

| o | | 5:4409d547b708

217

| o | | 5:4409d547b708

218

| |\ \ \

218

| |\ \ \

219

| | o | | 4:26a8bac39d9f

219

| | o | | 4:26a8bac39d9f

220

| |/|/ /

220

| |/|/ /

221

| o / / 3:27eef8ed80b4

221

| o / / 3:27eef8ed80b4

222

|/ / /

222

|/ / /

223

o / / 2:3d9a33b8d1e1

223

o / / 2:3d9a33b8d1e1

224

|/ /

224

|/ /

225

o / 1:6db2ef61d156

225

o / 1:6db2ef61d156

226

|/

226

|/

227

o 0:e6eb3150255d

227

o 0:e6eb3150255d

228

229

230

$ hg glog

230

$ hg glog

231

@ changeset: 34:fea3ac5810e0

231

@ changeset: 34:fea3ac5810e0

232

| tag: tip

232

| tag: tip

233

| parent: 32:d06dffa21a31

233

| parent: 32:d06dffa21a31

234

| user: test

234

| user: test

235

| date: Thu Jan 01 00:00:34 1970 +0000

235

| date: Thu Jan 01 00:00:34 1970 +0000

236

| summary: (34) head

236

| summary: (34) head

237

|

237

|

238

| o changeset: 33:68608f5145f9

238

| o changeset: 33:68608f5145f9

239

| | parent: 18:1aa84d96232a

239

| | parent: 18:1aa84d96232a

240

| | user: test

240

| | user: test

241

| | date: Thu Jan 01 00:00:33 1970 +0000

241

| | date: Thu Jan 01 00:00:33 1970 +0000

242

| | summary: (33) head

242

| | summary: (33) head

243

| |

243

| |

244

o | changeset: 32:d06dffa21a31

244

o | changeset: 32:d06dffa21a31

245

|\ \ parent: 27:886ed638191b

245

|\ \ parent: 27:886ed638191b

246

| | | parent: 31:621d83e11f67

246

| | | parent: 31:621d83e11f67

247

| | | user: test

247

| | | user: test

248

| | | date: Thu Jan 01 00:00:32 1970 +0000

248

| | | date: Thu Jan 01 00:00:32 1970 +0000

249

| | | summary: (32) expand

249

| | | summary: (32) expand

250

| | |

250

| | |

251

| o | changeset: 31:621d83e11f67

251

| o | changeset: 31:621d83e11f67

252

| |\ \ parent: 21:d42a756af44d

252

| |\ \ parent: 21:d42a756af44d

253

| | | | parent: 30:6e11cd4b648f

253

| | | | parent: 30:6e11cd4b648f

254

| | | | user: test

254

| | | | user: test

255

| | | | date: Thu Jan 01 00:00:31 1970 +0000

255

| | | | date: Thu Jan 01 00:00:31 1970 +0000

256

| | | | summary: (31) expand

256

| | | | summary: (31) expand

257

| | | |

257

| | | |

258

| | o | changeset: 30:6e11cd4b648f

258

| | o | changeset: 30:6e11cd4b648f

259

| | |\ \ parent: 28:44ecd0b9ae99

259

| | |\ \ parent: 28:44ecd0b9ae99

260

260

261

261

262

262

263

263

264

| | | | |

264

| | | | |

265

| | | o | changeset: 29:cd9bb2be7593

265

| | | o | changeset: 29:cd9bb2be7593

266

266

267

267

268

268

269

269

270

| | | | |

270

| | | | |

271

| | o | | changeset: 28:44ecd0b9ae99

271

| | o | | changeset: 28:44ecd0b9ae99

272

| | |\ \ \ parent: 1:6db2ef61d156

272

| | |\ \ \ parent: 1:6db2ef61d156

273

273

274

274

275

275

276

276

277

| | | | | |

277

| | | | | |

278

o | | | | | changeset: 27:886ed638191b

278

o | | | | | changeset: 27:886ed638191b

279

|/ / / / / parent: 21:d42a756af44d

279

|/ / / / / parent: 21:d42a756af44d

280

280

281

281

282

282

283

| | | | |

283

| | | | |

284

| | o---+ changeset: 26:7f25b6c2f0b9

284

| | o---+ changeset: 26:7f25b6c2f0b9

285

285

286

286

287

287

288

288

289

289

290

| | | | |

290

| | | | |

291

+---o | | changeset: 25:91da8ed57247

291

+---o | | changeset: 25:91da8ed57247

292

292

293

293

294

294

295

295

296

296

297

| | | | |

297

| | | | |

298

| | o | | changeset: 24:a9c19a3d96b7

298

| | o | | changeset: 24:a9c19a3d96b7

299

| | |\| | parent: 0:e6eb3150255d

299

| | |\| | parent: 0:e6eb3150255d

300

300

301

301

302

302

303

| | | | | summary: (24) merge one known; immediate right

303

| | | | | summary: (24) merge one known; immediate right

304

| | | | |

304

| | | | |

305

| | o | | changeset: 23:a01cddf0766d

305

| | o | | changeset: 23:a01cddf0766d

306

| |/| | | parent: 1:6db2ef61d156

306

| |/| | | parent: 1:6db2ef61d156

307

307

308

308

309

309

310

| | | | | summary: (23) merge one known; immediate left

310

| | | | | summary: (23) merge one known; immediate left

311

| | | | |

311

| | | | |

312

+---o---+ changeset: 22:e0d9cccacb5d

312

+---o---+ changeset: 22:e0d9cccacb5d

313

| | | | parent: 18:1aa84d96232a

313

| | | | parent: 18:1aa84d96232a

314

| | / / parent: 21:d42a756af44d

314

| | / / parent: 21:d42a756af44d

315

| | | | user: test

315

| | | | user: test

316

| | | | date: Thu Jan 01 00:00:22 1970 +0000

316

| | | | date: Thu Jan 01 00:00:22 1970 +0000

317

| | | | summary: (22) merge two known; one far left, one far right

317

| | | | summary: (22) merge two known; one far left, one far right

318

| | | |

318

| | | |

319

o | | | changeset: 21:d42a756af44d

319

o | | | changeset: 21:d42a756af44d

320

|\ \ \ \ parent: 19:31ddc2c1573b

320

|\ \ \ \ parent: 19:31ddc2c1573b

321

321

322

322

323

323

324

324

325

| | | | |

325

| | | | |

326

| o---+-+ changeset: 20:d30ed6450e32

326

| o---+-+ changeset: 20:d30ed6450e32

327

| | | | parent: 0:e6eb3150255d

327

| | | | parent: 0:e6eb3150255d

328

| / / / parent: 18:1aa84d96232a

328

| / / / parent: 18:1aa84d96232a

329

| | | | user: test

329

| | | | user: test

330

| | | | date: Thu Jan 01 00:00:20 1970 +0000

330

| | | | date: Thu Jan 01 00:00:20 1970 +0000

331

| | | | summary: (20) merge two known; two far right

331

| | | | summary: (20) merge two known; two far right

332

| | | |

332

| | | |

333

o | | | changeset: 19:31ddc2c1573b

333

o | | | changeset: 19:31ddc2c1573b

334

|\ \ \ \ parent: 15:1dda3f72782d

334

|\ \ \ \ parent: 15:1dda3f72782d

335

335

336

336

337

337

338

338

339

| | | | |

339

| | | | |

340

+---+---o changeset: 18:1aa84d96232a

340

+---+---o changeset: 18:1aa84d96232a

341

| | | | parent: 1:6db2ef61d156

341

| | | | parent: 1:6db2ef61d156

342

| | | | parent: 15:1dda3f72782d

342

| | | | parent: 15:1dda3f72782d

343

| | | | user: test

343

| | | | user: test

344

| | | | date: Thu Jan 01 00:00:18 1970 +0000

344

| | | | date: Thu Jan 01 00:00:18 1970 +0000

345

| | | | summary: (18) merge two known; two far left

345

| | | | summary: (18) merge two known; two far left

346

| | | |

346

| | | |

347

| o | | changeset: 17:44765d7c06e0

347

| o | | changeset: 17:44765d7c06e0

348

| |\ \ \ parent: 12:86b91144a6e9

348

| |\ \ \ parent: 12:86b91144a6e9

349

349

350

350

351

351

352

352

353

| | | | |

353

| | | | |

354

| | o---+ changeset: 16:3677d192927d

354

| | o---+ changeset: 16:3677d192927d

355

355

356

| | |/ / parent: 1:6db2ef61d156

356

| | |/ / parent: 1:6db2ef61d156

357

| | | | user: test

357

| | | | user: test

358

| | | | date: Thu Jan 01 00:00:16 1970 +0000

358

| | | | date: Thu Jan 01 00:00:16 1970 +0000

359

| | | | summary: (16) merge two known; one immediate right, one near right

359

| | | | summary: (16) merge two known; one immediate right, one near right

360

| | | |

360

| | | |

361

o | | | changeset: 15:1dda3f72782d

361

o | | | changeset: 15:1dda3f72782d

362

|\ \ \ \ parent: 13:22d8966a97e3

362

|\ \ \ \ parent: 13:22d8966a97e3

363

363

364

364

365

365

366

366

367

| | | | |

367

| | | | |

368

| o-----+ changeset: 14:8eac370358ef

368

| o-----+ changeset: 14:8eac370358ef

369

369

370

| |/ / / parent: 12:86b91144a6e9

370

| |/ / / parent: 12:86b91144a6e9

371

| | | | user: test

371

| | | | user: test

372

| | | | date: Thu Jan 01 00:00:14 1970 +0000

372

| | | | date: Thu Jan 01 00:00:14 1970 +0000

373

| | | | summary: (14) merge two known; one immediate right, one far right

373

| | | | summary: (14) merge two known; one immediate right, one far right

374

| | | |

374

| | | |

375

o | | | changeset: 13:22d8966a97e3

375

o | | | changeset: 13:22d8966a97e3

376

|\ \ \ \ parent: 9:7010c0af0a35

376

|\ \ \ \ parent: 9:7010c0af0a35

377

377

378

378

379

379

380

380

381

| | | | |

381

| | | | |

382

+---o | | changeset: 12:86b91144a6e9

382

+---o | | changeset: 12:86b91144a6e9

383

| | |/ / parent: 1:6db2ef61d156

383

| | |/ / parent: 1:6db2ef61d156

384

| | | | parent: 9:7010c0af0a35

384

| | | | parent: 9:7010c0af0a35

385

| | | | user: test

385

| | | | user: test

386

| | | | date: Thu Jan 01 00:00:12 1970 +0000

386

| | | | date: Thu Jan 01 00:00:12 1970 +0000

387

| | | | summary: (12) merge two known; one immediate right, one far left

387

| | | | summary: (12) merge two known; one immediate right, one far left

388

| | | |

388

| | | |

389

| o | | changeset: 11:832d76e6bdf2

389

| o | | changeset: 11:832d76e6bdf2

390

| |\ \ \ parent: 6:b105a072e251

390

| |\ \ \ parent: 6:b105a072e251

391

391

392

392

393

393

394

394

395

| | | | |

395

| | | | |

396

| | o---+ changeset: 10:74c64d036d72

396

| | o---+ changeset: 10:74c64d036d72

397

397

398

| |/ / / parent: 6:b105a072e251

398

| |/ / / parent: 6:b105a072e251

399

| | | | user: test

399

| | | | user: test

400

| | | | date: Thu Jan 01 00:00:10 1970 +0000

400

| | | | date: Thu Jan 01 00:00:10 1970 +0000

401

| | | | summary: (10) merge two known; one immediate left, one near right

401

| | | | summary: (10) merge two known; one immediate left, one near right

402

| | | |

402

| | | |

403

o | | | changeset: 9:7010c0af0a35

403

o | | | changeset: 9:7010c0af0a35

404

|\ \ \ \ parent: 7:b632bb1b1224

404

|\ \ \ \ parent: 7:b632bb1b1224

405

405

406

406

407

407

408

408

409

| | | | |

409

| | | | |

410

| o-----+ changeset: 8:7a0b11f71937

410

| o-----+ changeset: 8:7a0b11f71937

411

411

412

|/ / / / parent: 7:b632bb1b1224

412

|/ / / / parent: 7:b632bb1b1224

413

| | | | user: test

413

| | | | user: test

414

| | | | date: Thu Jan 01 00:00:08 1970 +0000

414

| | | | date: Thu Jan 01 00:00:08 1970 +0000

415

| | | | summary: (8) merge two known; one immediate left, one far right

415

| | | | summary: (8) merge two known; one immediate left, one far right

416

| | | |

416

| | | |

417

o | | | changeset: 7:b632bb1b1224

417

o | | | changeset: 7:b632bb1b1224

418

|\ \ \ \ parent: 2:3d9a33b8d1e1

418

|\ \ \ \ parent: 2:3d9a33b8d1e1

419

419

420

420

421

421

422

422

423

| | | | |

423

| | | | |

424

+---o | | changeset: 6:b105a072e251

424

+---o | | changeset: 6:b105a072e251

425

| |/ / / parent: 2:3d9a33b8d1e1

425

| |/ / / parent: 2:3d9a33b8d1e1

426

| | | | parent: 5:4409d547b708

426

| | | | parent: 5:4409d547b708

427

| | | | user: test

427

| | | | user: test

428

| | | | date: Thu Jan 01 00:00:06 1970 +0000

428

| | | | date: Thu Jan 01 00:00:06 1970 +0000

429

| | | | summary: (6) merge two known; one immediate left, one far left

429

| | | | summary: (6) merge two known; one immediate left, one far left

430

| | | |

430

| | | |

431

| o | | changeset: 5:4409d547b708

431

| o | | changeset: 5:4409d547b708

432

| |\ \ \ parent: 3:27eef8ed80b4

432

| |\ \ \ parent: 3:27eef8ed80b4

433

433

434

434

435

435

436

436

437

| | | | |

437

| | | | |

438

| | o | | changeset: 4:26a8bac39d9f

438

| | o | | changeset: 4:26a8bac39d9f

439

| |/|/ / parent: 1:6db2ef61d156

439

| |/|/ / parent: 1:6db2ef61d156

440

| | | | parent: 3:27eef8ed80b4

440

| | | | parent: 3:27eef8ed80b4

441

| | | | user: test

441

| | | | user: test

442

| | | | date: Thu Jan 01 00:00:04 1970 +0000

442

| | | | date: Thu Jan 01 00:00:04 1970 +0000

443

| | | | summary: (4) merge two known; one immediate left, one immediate right

443

| | | | summary: (4) merge two known; one immediate left, one immediate right

444

| | | |

444

| | | |

445

| o | | changeset: 3:27eef8ed80b4

445

| o | | changeset: 3:27eef8ed80b4

446

|/ / / user: test

446

|/ / / user: test

447

| | | date: Thu Jan 01 00:00:03 1970 +0000

447

| | | date: Thu Jan 01 00:00:03 1970 +0000

448

| | | summary: (3) collapse

448

| | | summary: (3) collapse

449

| | |

449

| | |

450

o | | changeset: 2:3d9a33b8d1e1

450

o | | changeset: 2:3d9a33b8d1e1

451

|/ / user: test

451

|/ / user: test

452

| | date: Thu Jan 01 00:00:02 1970 +0000

452

| | date: Thu Jan 01 00:00:02 1970 +0000

453

| | summary: (2) collapse

453

| | summary: (2) collapse

454

| |

454

| |

455

o | changeset: 1:6db2ef61d156

455

o | changeset: 1:6db2ef61d156

456

|/ user: test

456

|/ user: test

457

| date: Thu Jan 01 00:00:01 1970 +0000

457

| date: Thu Jan 01 00:00:01 1970 +0000

458

| summary: (1) collapse

458

| summary: (1) collapse

459

|

459

|

460

o changeset: 0:e6eb3150255d

460

o changeset: 0:e6eb3150255d

461

user: test

461

user: test

462

date: Thu Jan 01 00:00:00 1970 +0000

462

date: Thu Jan 01 00:00:00 1970 +0000

463

summary: (0) root

463

summary: (0) root

464

465

466

File glog:

466

File glog:

467

$ hg glog a

467

$ hg glog a

468

@ changeset: 34:fea3ac5810e0

468

@ changeset: 34:fea3ac5810e0

469

| tag: tip

469

| tag: tip

470

| parent: 32:d06dffa21a31

470

| parent: 32:d06dffa21a31

471

| user: test

471

| user: test

472

| date: Thu Jan 01 00:00:34 1970 +0000

472

| date: Thu Jan 01 00:00:34 1970 +0000

473

| summary: (34) head

473

| summary: (34) head

474

|

474

|

475

| o changeset: 33:68608f5145f9

475

| o changeset: 33:68608f5145f9

476

| | parent: 18:1aa84d96232a

476

| | parent: 18:1aa84d96232a

477

| | user: test

477

| | user: test

478

| | date: Thu Jan 01 00:00:33 1970 +0000

478

| | date: Thu Jan 01 00:00:33 1970 +0000

479

| | summary: (33) head

479

| | summary: (33) head

480

| |

480

| |

481

o | changeset: 32:d06dffa21a31

481

o | changeset: 32:d06dffa21a31

482

|\ \ parent: 27:886ed638191b

482

|\ \ parent: 27:886ed638191b

483

| | | parent: 31:621d83e11f67

483

| | | parent: 31:621d83e11f67

484

| | | user: test

484

| | | user: test

485

| | | date: Thu Jan 01 00:00:32 1970 +0000

485

| | | date: Thu Jan 01 00:00:32 1970 +0000

486

| | | summary: (32) expand

486

| | | summary: (32) expand

487

| | |

487

| | |

488

| o | changeset: 31:621d83e11f67

488

| o | changeset: 31:621d83e11f67

489

| |\ \ parent: 21:d42a756af44d

489

| |\ \ parent: 21:d42a756af44d

490

| | | | parent: 30:6e11cd4b648f

490

| | | | parent: 30:6e11cd4b648f

491

| | | | user: test

491

| | | | user: test

492

| | | | date: Thu Jan 01 00:00:31 1970 +0000

492

| | | | date: Thu Jan 01 00:00:31 1970 +0000

493

| | | | summary: (31) expand

493

| | | | summary: (31) expand

494

| | | |

494

| | | |

495

| | o | changeset: 30:6e11cd4b648f

495

| | o | changeset: 30:6e11cd4b648f

496

| | |\ \ parent: 28:44ecd0b9ae99

496

| | |\ \ parent: 28:44ecd0b9ae99

497

497

498

498

499

499

500

500

501

| | | | |

501

| | | | |

502

| | | o | changeset: 29:cd9bb2be7593

502

| | | o | changeset: 29:cd9bb2be7593

503

503

504

504

505

505

506

506

507

| | | | |

507

| | | | |

508

| | o | | changeset: 28:44ecd0b9ae99

508

| | o | | changeset: 28:44ecd0b9ae99

509

| | |\ \ \ parent: 1:6db2ef61d156

509

| | |\ \ \ parent: 1:6db2ef61d156

510

510

511

511

512

512

513

513

514

| | | | | |

514

| | | | | |

515

o | | | | | changeset: 27:886ed638191b

515

o | | | | | changeset: 27:886ed638191b

516

|/ / / / / parent: 21:d42a756af44d

516

|/ / / / / parent: 21:d42a756af44d

517

517

518

518

519

519

520

| | | | |

520

| | | | |

521

| | o---+ changeset: 26:7f25b6c2f0b9

521

| | o---+ changeset: 26:7f25b6c2f0b9

522

522

523

523

524

524

525

525

526

526

527

| | | | |

527

| | | | |

528

+---o | | changeset: 25:91da8ed57247

528

+---o | | changeset: 25:91da8ed57247

529

529

530

530

531

531

532

532

533

533

534

| | | | |

534

| | | | |

535

| | o | | changeset: 24:a9c19a3d96b7

535

| | o | | changeset: 24:a9c19a3d96b7

536

| | |\| | parent: 0:e6eb3150255d

536

| | |\| | parent: 0:e6eb3150255d

537

537

538

538

539

539

540

| | | | | summary: (24) merge one known; immediate right

540

| | | | | summary: (24) merge one known; immediate right

541

| | | | |

541

| | | | |

542

| | o | | changeset: 23:a01cddf0766d

542

| | o | | changeset: 23:a01cddf0766d

543

| |/| | | parent: 1:6db2ef61d156

543

| |/| | | parent: 1:6db2ef61d156

544

544

545

545

546

546

547

| | | | | summary: (23) merge one known; immediate left

547

| | | | | summary: (23) merge one known; immediate left

548

| | | | |

548

| | | | |

549

+---o---+ changeset: 22:e0d9cccacb5d

549

+---o---+ changeset: 22:e0d9cccacb5d

550

| | | | parent: 18:1aa84d96232a

550

| | | | parent: 18:1aa84d96232a

551

| | / / parent: 21:d42a756af44d

551

| | / / parent: 21:d42a756af44d

552

| | | | user: test

552

| | | | user: test

553

| | | | date: Thu Jan 01 00:00:22 1970 +0000

553

| | | | date: Thu Jan 01 00:00:22 1970 +0000

554

| | | | summary: (22) merge two known; one far left, one far right

554

| | | | summary: (22) merge two known; one far left, one far right

555

| | | |

555

| | | |

556

o | | | changeset: 21:d42a756af44d

556

o | | | changeset: 21:d42a756af44d

557

|\ \ \ \ parent: 19:31ddc2c1573b

557

|\ \ \ \ parent: 19:31ddc2c1573b

558

558

559

559

560

560

561

561

562

| | | | |

562

| | | | |

563

| o---+-+ changeset: 20:d30ed6450e32

563

| o---+-+ changeset: 20:d30ed6450e32

564

| | | | parent: 0:e6eb3150255d

564

| | | | parent: 0:e6eb3150255d

565

| / / / parent: 18:1aa84d96232a

565

| / / / parent: 18:1aa84d96232a

566

| | | | user: test

566

| | | | user: test

567

| | | | date: Thu Jan 01 00:00:20 1970 +0000

567

| | | | date: Thu Jan 01 00:00:20 1970 +0000

568

| | | | summary: (20) merge two known; two far right

568

| | | | summary: (20) merge two known; two far right

569

| | | |

569

| | | |

570

o | | | changeset: 19:31ddc2c1573b

570

o | | | changeset: 19:31ddc2c1573b

571

|\ \ \ \ parent: 15:1dda3f72782d

571

|\ \ \ \ parent: 15:1dda3f72782d

572

572

573

573

574

574

575

575

576

| | | | |

576

| | | | |

577

+---+---o changeset: 18:1aa84d96232a

577

+---+---o changeset: 18:1aa84d96232a

578

| | | | parent: 1:6db2ef61d156

578

| | | | parent: 1:6db2ef61d156

579

| | | | parent: 15:1dda3f72782d

579

| | | | parent: 15:1dda3f72782d

580

| | | | user: test

580

| | | | user: test

581

| | | | date: Thu Jan 01 00:00:18 1970 +0000

581

| | | | date: Thu Jan 01 00:00:18 1970 +0000

582

| | | | summary: (18) merge two known; two far left

582

| | | | summary: (18) merge two known; two far left

583

| | | |

583

| | | |

584

| o | | changeset: 17:44765d7c06e0

584

| o | | changeset: 17:44765d7c06e0

585

| |\ \ \ parent: 12:86b91144a6e9

585

| |\ \ \ parent: 12:86b91144a6e9

586

586

587

587

588

588

589

589

590

| | | | |

590

| | | | |

591

| | o---+ changeset: 16:3677d192927d

591

| | o---+ changeset: 16:3677d192927d

592

592

593

| | |/ / parent: 1:6db2ef61d156

593

| | |/ / parent: 1:6db2ef61d156

594

| | | | user: test

594

| | | | user: test

595

| | | | date: Thu Jan 01 00:00:16 1970 +0000

595

| | | | date: Thu Jan 01 00:00:16 1970 +0000

596

| | | | summary: (16) merge two known; one immediate right, one near right

596

| | | | summary: (16) merge two known; one immediate right, one near right

597

| | | |

597

| | | |

598

o | | | changeset: 15:1dda3f72782d

598

o | | | changeset: 15:1dda3f72782d

599

|\ \ \ \ parent: 13:22d8966a97e3

599

|\ \ \ \ parent: 13:22d8966a97e3

600

600

601

601

602

602

603

603

604

| | | | |

604

| | | | |

605

| o-----+ changeset: 14:8eac370358ef

605

| o-----+ changeset: 14:8eac370358ef

606

606

607

| |/ / / parent: 12:86b91144a6e9

607

| |/ / / parent: 12:86b91144a6e9

608

| | | | user: test

608

| | | | user: test

609

| | | | date: Thu Jan 01 00:00:14 1970 +0000

609

| | | | date: Thu Jan 01 00:00:14 1970 +0000

610

| | | | summary: (14) merge two known; one immediate right, one far right

610

| | | | summary: (14) merge two known; one immediate right, one far right

611

| | | |

611

| | | |

612

o | | | changeset: 13:22d8966a97e3

612

o | | | changeset: 13:22d8966a97e3

613

|\ \ \ \ parent: 9:7010c0af0a35

613

|\ \ \ \ parent: 9:7010c0af0a35

614

614

615

615

616

616

617

617

618

| | | | |

618

| | | | |

619

+---o | | changeset: 12:86b91144a6e9

619

+---o | | changeset: 12:86b91144a6e9

620

| | |/ / parent: 1:6db2ef61d156

620

| | |/ / parent: 1:6db2ef61d156

621

| | | | parent: 9:7010c0af0a35

621

| | | | parent: 9:7010c0af0a35

622

| | | | user: test

622

| | | | user: test

623

| | | | date: Thu Jan 01 00:00:12 1970 +0000

623

| | | | date: Thu Jan 01 00:00:12 1970 +0000

624

| | | | summary: (12) merge two known; one immediate right, one far left

624

| | | | summary: (12) merge two known; one immediate right, one far left

625

| | | |

625

| | | |

626

| o | | changeset: 11:832d76e6bdf2

626

| o | | changeset: 11:832d76e6bdf2

627

| |\ \ \ parent: 6:b105a072e251

627

| |\ \ \ parent: 6:b105a072e251

628

628

629

629

630

630

631

631

632

| | | | |

632

| | | | |

633

| | o---+ changeset: 10:74c64d036d72

633

| | o---+ changeset: 10:74c64d036d72

634

634

635

| |/ / / parent: 6:b105a072e251

635

| |/ / / parent: 6:b105a072e251

636

| | | | user: test

636

| | | | user: test

637

| | | | date: Thu Jan 01 00:00:10 1970 +0000

637

| | | | date: Thu Jan 01 00:00:10 1970 +0000

638

| | | | summary: (10) merge two known; one immediate left, one near right

638

| | | | summary: (10) merge two known; one immediate left, one near right

639

| | | |

639

| | | |

640

o | | | changeset: 9:7010c0af0a35

640

o | | | changeset: 9:7010c0af0a35

641

|\ \ \ \ parent: 7:b632bb1b1224

641

|\ \ \ \ parent: 7:b632bb1b1224

642

642

643

643

644

644

645

645

646

| | | | |

646

| | | | |

647

| o-----+ changeset: 8:7a0b11f71937

647

| o-----+ changeset: 8:7a0b11f71937

648

648

649

|/ / / / parent: 7:b632bb1b1224

649

|/ / / / parent: 7:b632bb1b1224

650

| | | | user: test

650

| | | | user: test

651

| | | | date: Thu Jan 01 00:00:08 1970 +0000

651

| | | | date: Thu Jan 01 00:00:08 1970 +0000

652

| | | | summary: (8) merge two known; one immediate left, one far right

652

| | | | summary: (8) merge two known; one immediate left, one far right

653

| | | |

653

| | | |

654

o | | | changeset: 7:b632bb1b1224

654

o | | | changeset: 7:b632bb1b1224

655

|\ \ \ \ parent: 2:3d9a33b8d1e1

655

|\ \ \ \ parent: 2:3d9a33b8d1e1

656

656

657

657

658

658

659

659

660

| | | | |

660

| | | | |

661

+---o | | changeset: 6:b105a072e251

661

+---o | | changeset: 6:b105a072e251

662

| |/ / / parent: 2:3d9a33b8d1e1

662

| |/ / / parent: 2:3d9a33b8d1e1

663

| | | | parent: 5:4409d547b708

663

| | | | parent: 5:4409d547b708

664

| | | | user: test

664

| | | | user: test

665

| | | | date: Thu Jan 01 00:00:06 1970 +0000

665

| | | | date: Thu Jan 01 00:00:06 1970 +0000

666

| | | | summary: (6) merge two known; one immediate left, one far left

666

| | | | summary: (6) merge two known; one immediate left, one far left

667

| | | |

667

| | | |

668

| o | | changeset: 5:4409d547b708

668

| o | | changeset: 5:4409d547b708

669

| |\ \ \ parent: 3:27eef8ed80b4

669

| |\ \ \ parent: 3:27eef8ed80b4

670

670

671

671

672

672

673

673

674

| | | | |

674

| | | | |

675

| | o | | changeset: 4:26a8bac39d9f

675

| | o | | changeset: 4:26a8bac39d9f

676

| |/|/ / parent: 1:6db2ef61d156

676

| |/|/ / parent: 1:6db2ef61d156

677

| | | | parent: 3:27eef8ed80b4

677

| | | | parent: 3:27eef8ed80b4

678

| | | | user: test

678

| | | | user: test

679

| | | | date: Thu Jan 01 00:00:04 1970 +0000

679

| | | | date: Thu Jan 01 00:00:04 1970 +0000

680

| | | | summary: (4) merge two known; one immediate left, one immediate right

680

| | | | summary: (4) merge two known; one immediate left, one immediate right

681

| | | |

681

| | | |

682

| o | | changeset: 3:27eef8ed80b4

682

| o | | changeset: 3:27eef8ed80b4

683

|/ / / user: test

683

|/ / / user: test

684

| | | date: Thu Jan 01 00:00:03 1970 +0000

684

| | | date: Thu Jan 01 00:00:03 1970 +0000

685

| | | summary: (3) collapse

685

| | | summary: (3) collapse

686

| | |

686

| | |

687

o | | changeset: 2:3d9a33b8d1e1

687

o | | changeset: 2:3d9a33b8d1e1

688

|/ / user: test

688

|/ / user: test

689

| | date: Thu Jan 01 00:00:02 1970 +0000

689

| | date: Thu Jan 01 00:00:02 1970 +0000

690

| | summary: (2) collapse

690

| | summary: (2) collapse

691

| |

691

| |

692

o | changeset: 1:6db2ef61d156

692

o | changeset: 1:6db2ef61d156

693

|/ user: test

693

|/ user: test

694

| date: Thu Jan 01 00:00:01 1970 +0000

694

| date: Thu Jan 01 00:00:01 1970 +0000

695

| summary: (1) collapse

695

| summary: (1) collapse

696

|

696

|

697

o changeset: 0:e6eb3150255d

697

o changeset: 0:e6eb3150255d

698

user: test

698

user: test

699

date: Thu Jan 01 00:00:00 1970 +0000

699

date: Thu Jan 01 00:00:00 1970 +0000

700

summary: (0) root

700

summary: (0) root

701

702

703

File glog per revset:

703

File glog per revset:

704

705

$ hg glog -r 'file("a")'

705

$ hg glog -r 'file("a")'

706

@ changeset: 34:fea3ac5810e0

706

@ changeset: 34:fea3ac5810e0

707

| tag: tip

707

| tag: tip

708

| parent: 32:d06dffa21a31

708

| parent: 32:d06dffa21a31

709

| user: test

709

| user: test

710

| date: Thu Jan 01 00:00:34 1970 +0000

710

| date: Thu Jan 01 00:00:34 1970 +0000

711

| summary: (34) head

711

| summary: (34) head

712

|

712

|

713

| o changeset: 33:68608f5145f9

713

| o changeset: 33:68608f5145f9

714

| | parent: 18:1aa84d96232a

714

| | parent: 18:1aa84d96232a

715

| | user: test

715

| | user: test

716

| | date: Thu Jan 01 00:00:33 1970 +0000

716

| | date: Thu Jan 01 00:00:33 1970 +0000

717

| | summary: (33) head

717

| | summary: (33) head

718

| |

718

| |

719

o | changeset: 32:d06dffa21a31

719

o | changeset: 32:d06dffa21a31

720

|\ \ parent: 27:886ed638191b

720

|\ \ parent: 27:886ed638191b

721

| | | parent: 31:621d83e11f67

721

| | | parent: 31:621d83e11f67

722

| | | user: test

722

| | | user: test

723

| | | date: Thu Jan 01 00:00:32 1970 +0000

723

| | | date: Thu Jan 01 00:00:32 1970 +0000

724

| | | summary: (32) expand

724

| | | summary: (32) expand

725

| | |

725

| | |

726

| o | changeset: 31:621d83e11f67

726

| o | changeset: 31:621d83e11f67

727

| |\ \ parent: 21:d42a756af44d

727

| |\ \ parent: 21:d42a756af44d

728

| | | | parent: 30:6e11cd4b648f

728

| | | | parent: 30:6e11cd4b648f

729

| | | | user: test

729

| | | | user: test

730

| | | | date: Thu Jan 01 00:00:31 1970 +0000

730

| | | | date: Thu Jan 01 00:00:31 1970 +0000

731

| | | | summary: (31) expand

731

| | | | summary: (31) expand

732

| | | |

732

| | | |

733

| | o | changeset: 30:6e11cd4b648f

733

| | o | changeset: 30:6e11cd4b648f

734

| | |\ \ parent: 28:44ecd0b9ae99

734

| | |\ \ parent: 28:44ecd0b9ae99

735

735

736

736

737

737

738

738

739

| | | | |

739

| | | | |

740

| | | o | changeset: 29:cd9bb2be7593

740

| | | o | changeset: 29:cd9bb2be7593

741

741

742

742

743

743

744

744

745

| | | | |

745

| | | | |

746

| | o | | changeset: 28:44ecd0b9ae99

746

| | o | | changeset: 28:44ecd0b9ae99

747

| | |\ \ \ parent: 1:6db2ef61d156

747

| | |\ \ \ parent: 1:6db2ef61d156

748

748

749

749

750

750

751

751

752

| | | | | |

752

| | | | | |

753

o | | | | | changeset: 27:886ed638191b

753

o | | | | | changeset: 27:886ed638191b

754

|/ / / / / parent: 21:d42a756af44d

754

|/ / / / / parent: 21:d42a756af44d

755

755

756

756

757

757

758

| | | | |

758

| | | | |

759

| | o---+ changeset: 26:7f25b6c2f0b9

759

| | o---+ changeset: 26:7f25b6c2f0b9

760

760

761

761

762

762

763

763

764

764

765

| | | | |

765

| | | | |

766

+---o | | changeset: 25:91da8ed57247

766

+---o | | changeset: 25:91da8ed57247

767

767

768

768

769

769

770

770

771

771

772

| | | | |

772

| | | | |

773

| | o | | changeset: 24:a9c19a3d96b7

773

| | o | | changeset: 24:a9c19a3d96b7

774

| | |\| | parent: 0:e6eb3150255d

774

| | |\| | parent: 0:e6eb3150255d

775

775

776

776

777

777

778

| | | | | summary: (24) merge one known; immediate right

778

| | | | | summary: (24) merge one known; immediate right

779

| | | | |

779

| | | | |

780

| | o | | changeset: 23:a01cddf0766d

780

| | o | | changeset: 23:a01cddf0766d

781

| |/| | | parent: 1:6db2ef61d156

781

| |/| | | parent: 1:6db2ef61d156

782

782

783

783

784

784

785

| | | | | summary: (23) merge one known; immediate left

785

| | | | | summary: (23) merge one known; immediate left

786

| | | | |

786

| | | | |

787

+---o---+ changeset: 22:e0d9cccacb5d

787

+---o---+ changeset: 22:e0d9cccacb5d

788

| | | | parent: 18:1aa84d96232a

788

| | | | parent: 18:1aa84d96232a

789

| | / / parent: 21:d42a756af44d

789

| | / / parent: 21:d42a756af44d

790

| | | | user: test

790

| | | | user: test

791

| | | | date: Thu Jan 01 00:00:22 1970 +0000

791

| | | | date: Thu Jan 01 00:00:22 1970 +0000

792

| | | | summary: (22) merge two known; one far left, one far right

792

| | | | summary: (22) merge two known; one far left, one far right

793

| | | |

793

| | | |

794

o | | | changeset: 21:d42a756af44d

794

o | | | changeset: 21:d42a756af44d

795

|\ \ \ \ parent: 19:31ddc2c1573b

795

|\ \ \ \ parent: 19:31ddc2c1573b

796

796

797

797

798

798

799

799

800

| | | | |

800

| | | | |

801

| o---+-+ changeset: 20:d30ed6450e32

801

| o---+-+ changeset: 20:d30ed6450e32

802

| | | | parent: 0:e6eb3150255d

802

| | | | parent: 0:e6eb3150255d

803

| / / / parent: 18:1aa84d96232a

803

| / / / parent: 18:1aa84d96232a

804

| | | | user: test

804

| | | | user: test

805

| | | | date: Thu Jan 01 00:00:20 1970 +0000

805

| | | | date: Thu Jan 01 00:00:20 1970 +0000

806

| | | | summary: (20) merge two known; two far right

806

| | | | summary: (20) merge two known; two far right

807

| | | |

807

| | | |

808

o | | | changeset: 19:31ddc2c1573b

808

o | | | changeset: 19:31ddc2c1573b

809

|\ \ \ \ parent: 15:1dda3f72782d

809

|\ \ \ \ parent: 15:1dda3f72782d

810

810

811

811

812

812

813

813

814

| | | | |

814

| | | | |

815

+---+---o changeset: 18:1aa84d96232a

815

+---+---o changeset: 18:1aa84d96232a

816

| | | | parent: 1:6db2ef61d156

816

| | | | parent: 1:6db2ef61d156

817

| | | | parent: 15:1dda3f72782d

817

| | | | parent: 15:1dda3f72782d

818

| | | | user: test

818

| | | | user: test

819

| | | | date: Thu Jan 01 00:00:18 1970 +0000

819

| | | | date: Thu Jan 01 00:00:18 1970 +0000

820

| | | | summary: (18) merge two known; two far left

820

| | | | summary: (18) merge two known; two far left

821

| | | |

821

| | | |

822

| o | | changeset: 17:44765d7c06e0

822

| o | | changeset: 17:44765d7c06e0

823

| |\ \ \ parent: 12:86b91144a6e9

823

| |\ \ \ parent: 12:86b91144a6e9

824

824

825

825

826

826

827

827

828

| | | | |

828

| | | | |

829

| | o---+ changeset: 16:3677d192927d

829

| | o---+ changeset: 16:3677d192927d

830

830

831

| | |/ / parent: 1:6db2ef61d156

831

| | |/ / parent: 1:6db2ef61d156

832

| | | | user: test

832

| | | | user: test

833

| | | | date: Thu Jan 01 00:00:16 1970 +0000

833

| | | | date: Thu Jan 01 00:00:16 1970 +0000

834

| | | | summary: (16) merge two known; one immediate right, one near right

834

| | | | summary: (16) merge two known; one immediate right, one near right

835

| | | |

835

| | | |

836

o | | | changeset: 15:1dda3f72782d

836

o | | | changeset: 15:1dda3f72782d

837

|\ \ \ \ parent: 13:22d8966a97e3

837

|\ \ \ \ parent: 13:22d8966a97e3

838

838

839

839

840

840

841

841

842

| | | | |

842

| | | | |

843

| o-----+ changeset: 14:8eac370358ef

843

| o-----+ changeset: 14:8eac370358ef

844

844

845

| |/ / / parent: 12:86b91144a6e9

845

| |/ / / parent: 12:86b91144a6e9

846

| | | | user: test

846

| | | | user: test

847

| | | | date: Thu Jan 01 00:00:14 1970 +0000

847

| | | | date: Thu Jan 01 00:00:14 1970 +0000

848

| | | | summary: (14) merge two known; one immediate right, one far right

848

| | | | summary: (14) merge two known; one immediate right, one far right

849

| | | |

849

| | | |

850

o | | | changeset: 13:22d8966a97e3

850

o | | | changeset: 13:22d8966a97e3

851

|\ \ \ \ parent: 9:7010c0af0a35

851

|\ \ \ \ parent: 9:7010c0af0a35

852

852

853

853

854

854

855

855

856

| | | | |

856

| | | | |

857

+---o | | changeset: 12:86b91144a6e9

857

+---o | | changeset: 12:86b91144a6e9

858

| | |/ / parent: 1:6db2ef61d156

858

| | |/ / parent: 1:6db2ef61d156

859

| | | | parent: 9:7010c0af0a35

859

| | | | parent: 9:7010c0af0a35

860

| | | | user: test

860

| | | | user: test

861

| | | | date: Thu Jan 01 00:00:12 1970 +0000

861

| | | | date: Thu Jan 01 00:00:12 1970 +0000

862

| | | | summary: (12) merge two known; one immediate right, one far left

862

| | | | summary: (12) merge two known; one immediate right, one far left

863

| | | |

863

| | | |

864

| o | | changeset: 11:832d76e6bdf2

864

| o | | changeset: 11:832d76e6bdf2

865

| |\ \ \ parent: 6:b105a072e251

865

| |\ \ \ parent: 6:b105a072e251

866

866

867

867

868

868

869

869

870

| | | | |

870

| | | | |

871

| | o---+ changeset: 10:74c64d036d72

871

| | o---+ changeset: 10:74c64d036d72

872

872

873

| |/ / / parent: 6:b105a072e251

873

| |/ / / parent: 6:b105a072e251

874

| | | | user: test

874

| | | | user: test

875

| | | | date: Thu Jan 01 00:00:10 1970 +0000

875

| | | | date: Thu Jan 01 00:00:10 1970 +0000

876

| | | | summary: (10) merge two known; one immediate left, one near right

876

| | | | summary: (10) merge two known; one immediate left, one near right

877

| | | |

877

| | | |

878

o | | | changeset: 9:7010c0af0a35

878

o | | | changeset: 9:7010c0af0a35

879

|\ \ \ \ parent: 7:b632bb1b1224

879

|\ \ \ \ parent: 7:b632bb1b1224

880

880

881

881

882

882

883

883

884

| | | | |

884

| | | | |

885

| o-----+ changeset: 8:7a0b11f71937

885

| o-----+ changeset: 8:7a0b11f71937

886

886

887

|/ / / / parent: 7:b632bb1b1224

887

|/ / / / parent: 7:b632bb1b1224

888

| | | | user: test

888

| | | | user: test

889

| | | | date: Thu Jan 01 00:00:08 1970 +0000

889

| | | | date: Thu Jan 01 00:00:08 1970 +0000

890

| | | | summary: (8) merge two known; one immediate left, one far right

890

| | | | summary: (8) merge two known; one immediate left, one far right

891

| | | |

891

| | | |

892

o | | | changeset: 7:b632bb1b1224

892

o | | | changeset: 7:b632bb1b1224

893

|\ \ \ \ parent: 2:3d9a33b8d1e1

893

|\ \ \ \ parent: 2:3d9a33b8d1e1

894

894

895

895

896

896

897

897

898

| | | | |

898

| | | | |

899

+---o | | changeset: 6:b105a072e251

899

+---o | | changeset: 6:b105a072e251

900

| |/ / / parent: 2:3d9a33b8d1e1

900

| |/ / / parent: 2:3d9a33b8d1e1

901

| | | | parent: 5:4409d547b708

901

| | | | parent: 5:4409d547b708

902

| | | | user: test

902

| | | | user: test

903

| | | | date: Thu Jan 01 00:00:06 1970 +0000

903

| | | | date: Thu Jan 01 00:00:06 1970 +0000

904

| | | | summary: (6) merge two known; one immediate left, one far left

904

| | | | summary: (6) merge two known; one immediate left, one far left

905

| | | |

905

| | | |

906

| o | | changeset: 5:4409d547b708

906

| o | | changeset: 5:4409d547b708

907

| |\ \ \ parent: 3:27eef8ed80b4

907

| |\ \ \ parent: 3:27eef8ed80b4

908

908

909

909

910

910

911

911

912

| | | | |

912

| | | | |

913

| | o | | changeset: 4:26a8bac39d9f

913

| | o | | changeset: 4:26a8bac39d9f

914

| |/|/ / parent: 1:6db2ef61d156

914

| |/|/ / parent: 1:6db2ef61d156

915

| | | | parent: 3:27eef8ed80b4

915

| | | | parent: 3:27eef8ed80b4

916

| | | | user: test

916

| | | | user: test

917

| | | | date: Thu Jan 01 00:00:04 1970 +0000

917

| | | | date: Thu Jan 01 00:00:04 1970 +0000

918

| | | | summary: (4) merge two known; one immediate left, one immediate right

918

| | | | summary: (4) merge two known; one immediate left, one immediate right

919

| | | |

919

| | | |

920

| o | | changeset: 3:27eef8ed80b4

920

| o | | changeset: 3:27eef8ed80b4

921

|/ / / user: test

921

|/ / / user: test

922

| | | date: Thu Jan 01 00:00:03 1970 +0000

922

| | | date: Thu Jan 01 00:00:03 1970 +0000

923

| | | summary: (3) collapse

923

| | | summary: (3) collapse

924

| | |

924

| | |

925

o | | changeset: 2:3d9a33b8d1e1

925

o | | changeset: 2:3d9a33b8d1e1

926

|/ / user: test

926

|/ / user: test

927

| | date: Thu Jan 01 00:00:02 1970 +0000

927

| | date: Thu Jan 01 00:00:02 1970 +0000

928

| | summary: (2) collapse

928

| | summary: (2) collapse

929

| |

929

| |

930

o | changeset: 1:6db2ef61d156

930

o | changeset: 1:6db2ef61d156

931

|/ user: test

931

|/ user: test

932

| date: Thu Jan 01 00:00:01 1970 +0000

932

| date: Thu Jan 01 00:00:01 1970 +0000

933

| summary: (1) collapse

933

| summary: (1) collapse

934

|

934

|

935

o changeset: 0:e6eb3150255d

935

o changeset: 0:e6eb3150255d

936

user: test

936

user: test

937

date: Thu Jan 01 00:00:00 1970 +0000

937

date: Thu Jan 01 00:00:00 1970 +0000

938

summary: (0) root

938

summary: (0) root

939

940

941

942

File glog per revset (only merges):

942

File glog per revset (only merges):

943

944

$ hg log -G -r 'file("a")' -m

944

$ hg log -G -r 'file("a")' -m

945

o changeset: 32:d06dffa21a31

945

o changeset: 32:d06dffa21a31

946

|\ parent: 27:886ed638191b

946

|\ parent: 27:886ed638191b

947

| | parent: 31:621d83e11f67

947

| | parent: 31:621d83e11f67

948

| | user: test

948

| | user: test

949

| | date: Thu Jan 01 00:00:32 1970 +0000

949

| | date: Thu Jan 01 00:00:32 1970 +0000

950

| | summary: (32) expand

950

| | summary: (32) expand

951

| |

951

| |

952

o | changeset: 31:621d83e11f67

952

o | changeset: 31:621d83e11f67

953

|\| parent: 21:d42a756af44d

953

|\| parent: 21:d42a756af44d

954

| | parent: 30:6e11cd4b648f

954

| | parent: 30:6e11cd4b648f

955

| | user: test

955

| | user: test

956

| | date: Thu Jan 01 00:00:31 1970 +0000

956

| | date: Thu Jan 01 00:00:31 1970 +0000

957

| | summary: (31) expand

957

| | summary: (31) expand

958

| |

958

| |

959

o | changeset: 30:6e11cd4b648f

959

o | changeset: 30:6e11cd4b648f

960

|\ \ parent: 28:44ecd0b9ae99

960

|\ \ parent: 28:44ecd0b9ae99

961

| | | parent: 29:cd9bb2be7593

961

| | | parent: 29:cd9bb2be7593

962

| | | user: test

962

| | | user: test

963

| | | date: Thu Jan 01 00:00:30 1970 +0000

963

| | | date: Thu Jan 01 00:00:30 1970 +0000

964

| | | summary: (30) expand

964

| | | summary: (30) expand

965

| | |

965

| | |

966

o | | changeset: 28:44ecd0b9ae99

966

o | | changeset: 28:44ecd0b9ae99

967

|\ \ \ parent: 1:6db2ef61d156

967

|\ \ \ parent: 1:6db2ef61d156

968

| | | | parent: 26:7f25b6c2f0b9

968

| | | | parent: 26:7f25b6c2f0b9

969

| | | | user: test

969

| | | | user: test

970

| | | | date: Thu Jan 01 00:00:28 1970 +0000

970

| | | | date: Thu Jan 01 00:00:28 1970 +0000

971

| | | | summary: (28) merge zero known

971

| | | | summary: (28) merge zero known

972

| | | |

972

| | | |

973

o | | | changeset: 26:7f25b6c2f0b9

973

o | | | changeset: 26:7f25b6c2f0b9

974

|\ \ \ \ parent: 18:1aa84d96232a

974

|\ \ \ \ parent: 18:1aa84d96232a

975

975

976

976

977

977

978

978

979

| | | | |

979

| | | | |

980

| o-----+ changeset: 25:91da8ed57247

980

| o-----+ changeset: 25:91da8ed57247

981

981

982

982

983

983

984

984

985

985

986

| | | | |

986

| | | | |

987

| o | | | changeset: 24:a9c19a3d96b7

987

| o | | | changeset: 24:a9c19a3d96b7

988

| |\ \ \ \ parent: 0:e6eb3150255d

988

| |\ \ \ \ parent: 0:e6eb3150255d

989

989

990

990

991

991

992

| | | | | | summary: (24) merge one known; immediate right

992

| | | | | | summary: (24) merge one known; immediate right

993

| | | | | |

993

| | | | | |

994

| o---+ | | changeset: 23:a01cddf0766d

994

| o---+ | | changeset: 23:a01cddf0766d

995

995

996

996

997

997

998

998

999

| | | | | | summary: (23) merge one known; immediate left

999

| | | | | | summary: (23) merge one known; immediate left

1000

| | | | | |

1000

| | | | | |

1001

| o-------+ changeset: 22:e0d9cccacb5d

1001

| o-------+ changeset: 22:e0d9cccacb5d

1002

1002

1003

|/ / / / / parent: 21:d42a756af44d

1003

|/ / / / / parent: 21:d42a756af44d

1004

1004

1005

1005

1006

| | | | | summary: (22) merge two known; one far left, one far right

1006

| | | | | summary: (22) merge two known; one far left, one far right

1007

| | | | |

1007

| | | | |

1008

| | | | o changeset: 21:d42a756af44d

1008

| | | | o changeset: 21:d42a756af44d

1009

1009

1010

1010

1011

1011

1012

1012

1013

1013

1014

| | | | | |

1014

| | | | | |

1015

+-+-------o changeset: 20:d30ed6450e32

1015

+-+-------o changeset: 20:d30ed6450e32

1016

1016

1017

1017

1018

1018

1019

1019

1020

| | | | | summary: (20) merge two known; two far right

1020

| | | | | summary: (20) merge two known; two far right

1021

| | | | |

1021

| | | | |

1022

| | | | o changeset: 19:31ddc2c1573b

1022

| | | | o changeset: 19:31ddc2c1573b

1023

1023

1024

1024

1025

1025

1026

1026

1027

1027

1028

| | | | | |

1028

| | | | | |

1029

o---+---+ | changeset: 18:1aa84d96232a

1029

o---+---+ | changeset: 18:1aa84d96232a

1030

1030

1031

/ / / / / parent: 15:1dda3f72782d

1031

/ / / / / parent: 15:1dda3f72782d

1032

1032

1033

1033

1034

| | | | | summary: (18) merge two known; two far left

1034

| | | | | summary: (18) merge two known; two far left

1035

| | | | |

1035

| | | | |

1036

| | | | o changeset: 17:44765d7c06e0

1036

| | | | o changeset: 17:44765d7c06e0

1037

1037

1038

1038

1039

1039

1040

1040

1041

1041

1042

| | | | | |

1042

| | | | | |

1043

+-+-------o changeset: 16:3677d192927d

1043

+-+-------o changeset: 16:3677d192927d

1044

1044

1045

1045

1046

1046

1047

1047

1048

| | | | | summary: (16) merge two known; one immediate right, one near right

1048

| | | | | summary: (16) merge two known; one immediate right, one near right

1049

| | | | |

1049

| | | | |

1050

| | | o | changeset: 15:1dda3f72782d

1050

| | | o | changeset: 15:1dda3f72782d

1051

| | | |\ \ parent: 13:22d8966a97e3

1051

| | | |\ \ parent: 13:22d8966a97e3

1052

1052

1053

1053

1054

1054

1055

1055

1056

| | | | | |

1056

| | | | | |

1057

+-------o | changeset: 14:8eac370358ef

1057

+-------o | changeset: 14:8eac370358ef

1058

1058

1059

1059

1060

1060

1061

1061

1062

| | | | | summary: (14) merge two known; one immediate right, one far right

1062

| | | | | summary: (14) merge two known; one immediate right, one far right

1063

| | | | |

1063

| | | | |

1064

| | | o | changeset: 13:22d8966a97e3

1064

| | | o | changeset: 13:22d8966a97e3

1065

| | | |\ \ parent: 9:7010c0af0a35

1065

| | | |\ \ parent: 9:7010c0af0a35

1066

1066

1067

1067

1068

1068

1069

1069

1070

| | | | | |

1070

| | | | | |

1071

| +---+---o changeset: 12:86b91144a6e9

1071

| +---+---o changeset: 12:86b91144a6e9

1072

1072

1073

1073

1074

1074

1075

1075

1076

| | | | | summary: (12) merge two known; one immediate right, one far left

1076

| | | | | summary: (12) merge two known; one immediate right, one far left

1077

| | | | |

1077

| | | | |

1078

| | | | o changeset: 11:832d76e6bdf2

1078

| | | | o changeset: 11:832d76e6bdf2

1079

1079

1080

1080

1081

1081

1082

1082

1083

1083

1084

| | | | | |

1084

| | | | | |

1085

+---------o changeset: 10:74c64d036d72

1085

+---------o changeset: 10:74c64d036d72

1086

1086

1087

1087

1088

1088

1089

1089

1090

| | | | | summary: (10) merge two known; one immediate left, one near right

1090

| | | | | summary: (10) merge two known; one immediate left, one near right

1091

| | | | |

1091

| | | | |

1092

| | | o | changeset: 9:7010c0af0a35

1092

| | | o | changeset: 9:7010c0af0a35

1093

| | | |\ \ parent: 7:b632bb1b1224

1093

| | | |\ \ parent: 7:b632bb1b1224

1094

1094

1095

1095

1096

1096

1097

1097

1098

| | | | | |

1098

| | | | | |

1099

+-------o | changeset: 8:7a0b11f71937

1099

+-------o | changeset: 8:7a0b11f71937

1100

| | | |/ / parent: 0:e6eb3150255d

1100

| | | |/ / parent: 0:e6eb3150255d

1101

1101

1102

1102

1103

1103

1104

| | | | | summary: (8) merge two known; one immediate left, one far right

1104

| | | | | summary: (8) merge two known; one immediate left, one far right

1105

| | | | |

1105

| | | | |

1106

| | | o | changeset: 7:b632bb1b1224

1106

| | | o | changeset: 7:b632bb1b1224

1107

| | | |\ \ parent: 2:3d9a33b8d1e1

1107

| | | |\ \ parent: 2:3d9a33b8d1e1

1108

1108

1109

1109

1110

1110

1111

1111

1112

| | | | | |

1112

| | | | | |

1113

| | | +---o changeset: 6:b105a072e251

1113

| | | +---o changeset: 6:b105a072e251

1114

1114

1115

1115

1116

1116

1117

1117

1118

| | | | | summary: (6) merge two known; one immediate left, one far left

1118

| | | | | summary: (6) merge two known; one immediate left, one far left

1119

| | | | |

1119

| | | | |

1120

| | | o | changeset: 5:4409d547b708

1120

| | | o | changeset: 5:4409d547b708

1121

| | | |\ \ parent: 3:27eef8ed80b4

1121

| | | |\ \ parent: 3:27eef8ed80b4

1122

1122

1123

1123

1124

1124

1125

1125

1126

| | | | | |

1126

| | | | | |

1127

| +---o | | changeset: 4:26a8bac39d9f

1127

| +---o | | changeset: 4:26a8bac39d9f

1128

| | | |/ / parent: 1:6db2ef61d156

1128

| | | |/ / parent: 1:6db2ef61d156

1129

1129

1130

1130

1131

1131

1132

| | | | | summary: (4) merge two known; one immediate left, one immediate right

1132

| | | | | summary: (4) merge two known; one immediate left, one immediate right

1133

| | | | |

1133

| | | | |

1134

1135

1136

Empty revision range - display nothing:

1136

Empty revision range - display nothing:

1137

$ hg glog -r 1..0

1137

$ hg glog -r 1..0

1138

1139

From outer space:

1139

From outer space:

1140

$ cd ..

1140

$ cd ..

1141

$ hg glog -l1 repo

1141

$ hg glog -l1 repo

1142

@ changeset: 34:fea3ac5810e0

1142

@ changeset: 34:fea3ac5810e0

1143

| tag: tip

1143

| tag: tip

1144

| parent: 32:d06dffa21a31

1144

| parent: 32:d06dffa21a31

1145

| user: test

1145

| user: test

1146

| date: Thu Jan 01 00:00:34 1970 +0000

1146

| date: Thu Jan 01 00:00:34 1970 +0000

1147

| summary: (34) head

1147

| summary: (34) head

1148

|

1148

|

1149

$ hg glog -l1 repo/a

1149

$ hg glog -l1 repo/a

1150

@ changeset: 34:fea3ac5810e0

1150

@ changeset: 34:fea3ac5810e0

1151

| tag: tip

1151

| tag: tip

1152

| parent: 32:d06dffa21a31

1152

| parent: 32:d06dffa21a31

1153

| user: test

1153

| user: test

1154

| date: Thu Jan 01 00:00:34 1970 +0000

1154

| date: Thu Jan 01 00:00:34 1970 +0000

1155

| summary: (34) head

1155

| summary: (34) head

1156

|

1156

|

1157

$ hg glog -l1 repo/missing

1157

$ hg glog -l1 repo/missing

1158

1159

File log with revs != cset revs:

1159

File log with revs != cset revs:

1160

$ hg init flog

1160

$ hg init flog

1161

$ cd flog

1161

$ cd flog

1162

$ echo one >one

1162

$ echo one >one

1163

$ hg add one

1163

$ hg add one

1164

$ hg commit -mone

1164

$ hg commit -mone

1165

$ echo two >two

1165

$ echo two >two

1166

$ hg add two

1166

$ hg add two

1167

$ hg commit -mtwo

1167

$ hg commit -mtwo

1168

$ echo more >two

1168

$ echo more >two

1169

$ hg commit -mmore

1169

$ hg commit -mmore

1170

$ hg glog two

1170

$ hg glog two

1171

@ changeset: 2:12c28321755b

1171

@ changeset: 2:12c28321755b

1172

| tag: tip

1172

| tag: tip

1173

| user: test

1173

| user: test

1174

| date: Thu Jan 01 00:00:00 1970 +0000

1174

| date: Thu Jan 01 00:00:00 1970 +0000

1175

| summary: more

1175

| summary: more

1176

|

1176

|

1177

o changeset: 1:5ac72c0599bf

1177

o changeset: 1:5ac72c0599bf

1178

| user: test

1178

| user: test

1179

| date: Thu Jan 01 00:00:00 1970 +0000

1179

| date: Thu Jan 01 00:00:00 1970 +0000

1180

| summary: two

1180

| summary: two

1181

|

1181

|

1182

1183

Issue1896: File log with explicit style

1183

Issue1896: File log with explicit style

1184

$ hg glog --style=default one

1184

$ hg glog --style=default one

1185

o changeset: 0:3d578b4a1f53

1185

o changeset: 0:3d578b4a1f53

1186

user: test

1186

user: test

1187

date: Thu Jan 01 00:00:00 1970 +0000

1187

date: Thu Jan 01 00:00:00 1970 +0000

1188

summary: one

1188

summary: one

1189

1190

Issue2395: glog --style header and footer

1190

Issue2395: glog --style header and footer

1191

$ hg glog --style=xml one

1191

$ hg glog --style=xml one

1192

<?xml version="1.0"?>

1192

<?xml version="1.0"?>

1193

<log>

1193

<log>

1194

o <logentry revision="0" node="3d578b4a1f537d5fcf7301bfa9c0b97adfaa6fb1">

1194

o <logentry revision="0" node="3d578b4a1f537d5fcf7301bfa9c0b97adfaa6fb1">

1195

1195

1196

1196

1197

1197

1198

</logentry>

1198

</logentry>

1199

</log>

1199

</log>

1200

1201

$ cd ..

1201

$ cd ..

1202

1203

Incoming and outgoing:

1203

Incoming and outgoing:

1204

1205

$ hg clone -U -r31 repo repo2

1205

$ hg clone -U -r31 repo repo2

1206

adding changesets

1206

adding changesets

1207

adding manifests

1207

adding manifests

1208

adding file changes

1208

adding file changes

1209

added 31 changesets with 31 changes to 1 files

1209

added 31 changesets with 31 changes to 1 files

1210

$ cd repo2

1210

$ cd repo2

1211

1212

$ hg incoming --graph ../repo

1212

$ hg incoming --graph ../repo

1213

comparing with ../repo

1213

comparing with ../repo

1214

searching for changes

1214

searching for changes

1215

o changeset: 34:fea3ac5810e0

1215

o changeset: 34:fea3ac5810e0

1216

| tag: tip

1216

| tag: tip

1217

| parent: 32:d06dffa21a31

1217

| parent: 32:d06dffa21a31

1218

| user: test

1218

| user: test

1219

| date: Thu Jan 01 00:00:34 1970 +0000

1219

| date: Thu Jan 01 00:00:34 1970 +0000

1220

| summary: (34) head

1220

| summary: (34) head

1221

|

1221

|

1222

| o changeset: 33:68608f5145f9

1222

| o changeset: 33:68608f5145f9

1223

| parent: 18:1aa84d96232a

1223

| parent: 18:1aa84d96232a

1224

| user: test

1224

| user: test

1225

| date: Thu Jan 01 00:00:33 1970 +0000

1225

| date: Thu Jan 01 00:00:33 1970 +0000

1226

| summary: (33) head

1226

| summary: (33) head

1227

|

1227

|

1228

o changeset: 32:d06dffa21a31

1228

o changeset: 32:d06dffa21a31

1229

| parent: 27:886ed638191b

1229

| parent: 27:886ed638191b

1230

| parent: 31:621d83e11f67

1230

| parent: 31:621d83e11f67

1231

| user: test

1231

| user: test

1232

| date: Thu Jan 01 00:00:32 1970 +0000

1232

| date: Thu Jan 01 00:00:32 1970 +0000

1233

| summary: (32) expand

1233

| summary: (32) expand

1234

|

1234

|

1235

o changeset: 27:886ed638191b

1235

o changeset: 27:886ed638191b

1236

parent: 21:d42a756af44d

1236

parent: 21:d42a756af44d

1237

user: test

1237

user: test

1238

date: Thu Jan 01 00:00:27 1970 +0000

1238

date: Thu Jan 01 00:00:27 1970 +0000

1239

summary: (27) collapse

1239

summary: (27) collapse

1240

1241

$ cd ..

1241

$ cd ..

1242

1243

$ hg -R repo outgoing --graph repo2

1243

$ hg -R repo outgoing --graph repo2

1244

comparing with repo2

1244

comparing with repo2

1245

searching for changes

1245

searching for changes

1246

@ changeset: 34:fea3ac5810e0

1246

@ changeset: 34:fea3ac5810e0

1247

| tag: tip

1247

| tag: tip

1248

| parent: 32:d06dffa21a31

1248

| parent: 32:d06dffa21a31

1249

| user: test

1249

| user: test

1250

| date: Thu Jan 01 00:00:34 1970 +0000

1250

| date: Thu Jan 01 00:00:34 1970 +0000

1251

| summary: (34) head

1251

| summary: (34) head

1252

|

1252

|

1253

| o changeset: 33:68608f5145f9

1253

| o changeset: 33:68608f5145f9

1254

| parent: 18:1aa84d96232a

1254

| parent: 18:1aa84d96232a

1255

| user: test

1255

| user: test

1256

| date: Thu Jan 01 00:00:33 1970 +0000

1256

| date: Thu Jan 01 00:00:33 1970 +0000

1257

| summary: (33) head

1257

| summary: (33) head

1258

|

1258

|

1259

o changeset: 32:d06dffa21a31

1259

o changeset: 32:d06dffa21a31

1260

| parent: 27:886ed638191b

1260

| parent: 27:886ed638191b

1261

| parent: 31:621d83e11f67

1261

| parent: 31:621d83e11f67

1262

| user: test

1262

| user: test

1263

| date: Thu Jan 01 00:00:32 1970 +0000

1263

| date: Thu Jan 01 00:00:32 1970 +0000

1264

| summary: (32) expand

1264

| summary: (32) expand

1265

|

1265

|

1266

o changeset: 27:886ed638191b

1266

o changeset: 27:886ed638191b

1267

parent: 21:d42a756af44d

1267

parent: 21:d42a756af44d

1268

user: test

1268

user: test

1269

date: Thu Jan 01 00:00:27 1970 +0000

1269

date: Thu Jan 01 00:00:27 1970 +0000

1270

summary: (27) collapse

1270

summary: (27) collapse

1271

1272

1273

File + limit with revs != cset revs:

1273

File + limit with revs != cset revs:

1274

$ cd repo

1274

$ cd repo

1275

$ touch b

1275

$ touch b

1276

$ hg ci -Aqm0

1276

$ hg ci -Aqm0

1277

$ hg glog -l2 a

1277

$ hg glog -l2 a

1278

o changeset: 34:fea3ac5810e0

1278

o changeset: 34:fea3ac5810e0

1279

| parent: 32:d06dffa21a31

1279

| parent: 32:d06dffa21a31

1280

| user: test

1280

| user: test

1281

| date: Thu Jan 01 00:00:34 1970 +0000

1281

| date: Thu Jan 01 00:00:34 1970 +0000

1282

| summary: (34) head

1282

| summary: (34) head

1283

|

1283

|

1284

| o changeset: 33:68608f5145f9

1284

| o changeset: 33:68608f5145f9

1285

| | parent: 18:1aa84d96232a

1285

| | parent: 18:1aa84d96232a

1286

| | user: test

1286

| | user: test

1287

| | date: Thu Jan 01 00:00:33 1970 +0000

1287

| | date: Thu Jan 01 00:00:33 1970 +0000

1288

| | summary: (33) head

1288

| | summary: (33) head

1289

| |

1289

| |

1290

1291

File + limit + -ra:b, (b - a) < limit:

1291

File + limit + -ra:b, (b - a) < limit:

1292

$ hg glog -l3000 -r32:tip a

1292

$ hg glog -l3000 -r32:tip a

1293

o changeset: 34:fea3ac5810e0

1293

o changeset: 34:fea3ac5810e0

1294

| parent: 32:d06dffa21a31

1294

| parent: 32:d06dffa21a31

1295

| user: test

1295

| user: test

1296

| date: Thu Jan 01 00:00:34 1970 +0000

1296

| date: Thu Jan 01 00:00:34 1970 +0000

1297

| summary: (34) head

1297

| summary: (34) head

1298

|

1298

|

1299

| o changeset: 33:68608f5145f9

1299

| o changeset: 33:68608f5145f9

1300

| | parent: 18:1aa84d96232a

1300

| | parent: 18:1aa84d96232a

1301

| | user: test

1301

| | user: test

1302

| | date: Thu Jan 01 00:00:33 1970 +0000

1302

| | date: Thu Jan 01 00:00:33 1970 +0000

1303

| | summary: (33) head

1303

| | summary: (33) head

1304

| |

1304

| |

1305

o | changeset: 32:d06dffa21a31

1305

o | changeset: 32:d06dffa21a31

1306

|\ \ parent: 27:886ed638191b

1306

|\ \ parent: 27:886ed638191b

1307

| | | parent: 31:621d83e11f67

1307

| | | parent: 31:621d83e11f67

1308

| | | user: test

1308

| | | user: test

1309

| | | date: Thu Jan 01 00:00:32 1970 +0000

1309

| | | date: Thu Jan 01 00:00:32 1970 +0000

1310

| | | summary: (32) expand

1310

| | | summary: (32) expand

1311

| | |

1311

| | |

1312

1313

Point out a common and an uncommon unshown parent

1313

Point out a common and an uncommon unshown parent

1314

1315

$ hg glog -r 'rev(8) or rev(9)'

1315

$ hg glog -r 'rev(8) or rev(9)'

1316

o changeset: 9:7010c0af0a35

1316

o changeset: 9:7010c0af0a35

1317

|\ parent: 7:b632bb1b1224

1317

|\ parent: 7:b632bb1b1224

1318

| | parent: 8:7a0b11f71937

1318

| | parent: 8:7a0b11f71937

1319

| | user: test

1319

| | user: test

1320

| | date: Thu Jan 01 00:00:09 1970 +0000

1320

| | date: Thu Jan 01 00:00:09 1970 +0000

1321

| | summary: (9) expand

1321

| | summary: (9) expand

1322

| |

1322

| |

1323

o | changeset: 8:7a0b11f71937

1323

o | changeset: 8:7a0b11f71937

1324

|\| parent: 0:e6eb3150255d

1324

|\| parent: 0:e6eb3150255d

1325

| | parent: 7:b632bb1b1224

1325

| | parent: 7:b632bb1b1224

1326

| | user: test

1326

| | user: test

1327

| | date: Thu Jan 01 00:00:08 1970 +0000

1327

| | date: Thu Jan 01 00:00:08 1970 +0000

1328

| | summary: (8) merge two known; one immediate left, one far right

1328

| | summary: (8) merge two known; one immediate left, one far right

1329

| |

1329

| |

1330

1331

File + limit + -ra:b, b < tip:

1331

File + limit + -ra:b, b < tip:

1332

1333

$ hg glog -l1 -r32:34 a

1333

$ hg glog -l1 -r32:34 a

1334

o changeset: 34:fea3ac5810e0

1334

o changeset: 34:fea3ac5810e0

1335

| parent: 32:d06dffa21a31

1335

| parent: 32:d06dffa21a31

1336

| user: test

1336

| user: test

1337

| date: Thu Jan 01 00:00:34 1970 +0000

1337

| date: Thu Jan 01 00:00:34 1970 +0000

1338

| summary: (34) head

1338

| summary: (34) head

1339

|

1339

|

1340

1341

file(File) + limit + -ra:b, b < tip:

1341

file(File) + limit + -ra:b, b < tip:

1342

1343

$ hg glog -l1 -r32:34 -r 'file("a")'

1343

$ hg glog -l1 -r32:34 -r 'file("a")'

1344

o changeset: 34:fea3ac5810e0

1344

o changeset: 34:fea3ac5810e0

1345

| parent: 32:d06dffa21a31

1345

| parent: 32:d06dffa21a31

1346

| user: test

1346

| user: test

1347

| date: Thu Jan 01 00:00:34 1970 +0000

1347

| date: Thu Jan 01 00:00:34 1970 +0000

1348

| summary: (34) head

1348

| summary: (34) head

1349

|

1349

|

1350

1351

limit(file(File) and a::b), b < tip:

1351

limit(file(File) and a::b), b < tip:

1352

1353

$ hg glog -r 'limit(file("a") and 32::34, 1)'

1353

$ hg glog -r 'limit(file("a") and 32::34, 1)'

1354

o changeset: 32:d06dffa21a31

1354

o changeset: 32:d06dffa21a31

1355

|\ parent: 27:886ed638191b

1355

|\ parent: 27:886ed638191b

1356

| | parent: 31:621d83e11f67

1356

| | parent: 31:621d83e11f67

1357

| | user: test

1357

| | user: test

1358

| | date: Thu Jan 01 00:00:32 1970 +0000

1358

| | date: Thu Jan 01 00:00:32 1970 +0000

1359

| | summary: (32) expand

1359

| | summary: (32) expand

1360

| |

1360

| |

1361

1362

File + limit + -ra:b, b < tip:

1362

File + limit + -ra:b, b < tip:

1363

1364

$ hg glog -r 'limit(file("a") and 34::32, 1)'

1364

$ hg glog -r 'limit(file("a") and 34::32, 1)'

1365

1366

File + limit + -ra:b, b < tip, (b - a) < limit:

1366

File + limit + -ra:b, b < tip, (b - a) < limit:

1367

1368

$ hg glog -l10 -r33:34 a

1368

$ hg glog -l10 -r33:34 a

1369

o changeset: 34:fea3ac5810e0

1369

o changeset: 34:fea3ac5810e0

1370

| parent: 32:d06dffa21a31

1370

| parent: 32:d06dffa21a31

1371

| user: test

1371

| user: test

1372

| date: Thu Jan 01 00:00:34 1970 +0000

1372

| date: Thu Jan 01 00:00:34 1970 +0000

1373

| summary: (34) head

1373

| summary: (34) head

1374

|

1374

|

1375

| o changeset: 33:68608f5145f9

1375

| o changeset: 33:68608f5145f9

1376

| | parent: 18:1aa84d96232a

1376

| | parent: 18:1aa84d96232a

1377

| | user: test

1377

| | user: test

1378

| | date: Thu Jan 01 00:00:33 1970 +0000

1378

| | date: Thu Jan 01 00:00:33 1970 +0000

1379

| | summary: (33) head

1379

| | summary: (33) head

1380

| |

1380

| |

1381

1382

Do not crash or produce strange graphs if history is buggy

1382

Do not crash or produce strange graphs if history is buggy

1383

1384

$ hg branch branch

1384

$ hg branch branch

1385

marked working directory as branch branch

1385

marked working directory as branch branch

1386

(branches are permanent and global, did you want a bookmark?)

1386

(branches are permanent and global, did you want a bookmark?)

1387

$ commit 36 "buggy merge: identical parents" 35 35

1387

$ commit 36 "buggy merge: identical parents" 35 35

1388

$ hg glog -l5

1388

$ hg glog -l5

1389

@ changeset: 36:08a19a744424

1389

@ changeset: 36:08a19a744424

1390

| branch: branch

1390

| branch: branch

1391

| tag: tip

1391

| tag: tip

1392

| parent: 35:9159c3644c5e

1392

| parent: 35:9159c3644c5e

1393

| parent: 35:9159c3644c5e

1393

| parent: 35:9159c3644c5e

1394

| user: test

1394

| user: test

1395

| date: Thu Jan 01 00:00:36 1970 +0000

1395

| date: Thu Jan 01 00:00:36 1970 +0000

1396

| summary: (36) buggy merge: identical parents

1396

| summary: (36) buggy merge: identical parents

1397

|

1397

|

1398

o changeset: 35:9159c3644c5e

1398

o changeset: 35:9159c3644c5e

1399

| user: test

1399

| user: test

1400

| date: Thu Jan 01 00:00:00 1970 +0000

1400

| date: Thu Jan 01 00:00:00 1970 +0000

1401

| summary: 0

1401

| summary: 0

1402

|

1402

|

1403

o changeset: 34:fea3ac5810e0

1403

o changeset: 34:fea3ac5810e0

1404

| parent: 32:d06dffa21a31

1404

| parent: 32:d06dffa21a31

1405

| user: test

1405

| user: test

1406

| date: Thu Jan 01 00:00:34 1970 +0000

1406

| date: Thu Jan 01 00:00:34 1970 +0000

1407

| summary: (34) head

1407

| summary: (34) head

1408

|

1408

|

1409

| o changeset: 33:68608f5145f9

1409

| o changeset: 33:68608f5145f9

1410

| | parent: 18:1aa84d96232a

1410

| | parent: 18:1aa84d96232a

1411

| | user: test

1411

| | user: test

1412

| | date: Thu Jan 01 00:00:33 1970 +0000

1412

| | date: Thu Jan 01 00:00:33 1970 +0000

1413

| | summary: (33) head

1413

| | summary: (33) head

1414

| |

1414

| |

1415

o | changeset: 32:d06dffa21a31

1415

o | changeset: 32:d06dffa21a31

1416

|\ \ parent: 27:886ed638191b

1416

|\ \ parent: 27:886ed638191b

1417

| | | parent: 31:621d83e11f67

1417

| | | parent: 31:621d83e11f67

1418

| | | user: test

1418

| | | user: test

1419

| | | date: Thu Jan 01 00:00:32 1970 +0000

1419

| | | date: Thu Jan 01 00:00:32 1970 +0000

1420

| | | summary: (32) expand

1420

| | | summary: (32) expand

1421

| | |

1421

| | |

1422

1423

Test log -G options

1423

Test log -G options

1424

1425

$ testlog() {

1425

$ testlog() {

1426

> hg log -G --print-revset "$@"

1426

> hg log -G --print-revset "$@"

1427

> hg log --template 'nodetag {rev}\n' "$@" | grep nodetag \

1427

> hg log --template 'nodetag {rev}\n' "$@" | grep nodetag \

1428

> | sed 's/.*nodetag/nodetag/' > log.nodes

1428

> | sed 's/.*nodetag/nodetag/' > log.nodes

1429

> hg log -G --template 'nodetag {rev}\n' "$@" | grep nodetag \

1429

> hg log -G --template 'nodetag {rev}\n' "$@" | grep nodetag \

1430

> | sed 's/.*nodetag/nodetag/' > glog.nodes

1430

> | sed 's/.*nodetag/nodetag/' > glog.nodes

1431

> diff -u log.nodes glog.nodes

1431

> diff -u log.nodes glog.nodes | grep '^[-+@ ]' || :

1432

> }

1432

> }

1433

1434

glog always reorders nodes which explains the difference with log

1434

glog always reorders nodes which explains the difference with log

1435

1436

$ testlog -r 27 -r 25 -r 21 -r 34 -r 32 -r 31

1436

$ testlog -r 27 -r 25 -r 21 -r 34 -r 32 -r 31

1437

['27', '25', '21', '34', '32', '31']

1437

['27', '25', '21', '34', '32', '31']

1438

[]

1438

[]

1439

--- log.nodes * (glob)

1439

--- log.nodes * (glob)

1440

+++ glog.nodes * (glob)

1440

+++ glog.nodes * (glob)

1441

@@ -1,6 +1,6 @@

1441

@@ -1,6 +1,6 @@

1442

-nodetag 27

1442

-nodetag 27

1443

-nodetag 25

1443

-nodetag 25

1444

-nodetag 21

1444

-nodetag 21

1445

nodetag 34

1445

nodetag 34

1446

nodetag 32

1446

nodetag 32

1447

nodetag 31

1447

nodetag 31

1448

+nodetag 27

1448

+nodetag 27

1449

+nodetag 25

1449

+nodetag 25

1450

+nodetag 21

1450

+nodetag 21

1451

[1]

1452

$ testlog -u test -u not-a-user

1451

$ testlog -u test -u not-a-user

1453

[]

1452

[]

1454

(group

1453

(group

1455

(group

1454

(group

1456

(or

1455

(or

1457

(func

1456

(func

1458

('symbol', 'user')

1457

('symbol', 'user')

1459

('string', 'test'))

1458

('string', 'test'))

1460

(func

1459

(func

1461

('symbol', 'user')

1460

('symbol', 'user')

1462

('string', 'not-a-user')))))

1461

('string', 'not-a-user')))))

1463

$ testlog -b not-a-branch

1462

$ testlog -b not-a-branch

1464

abort: unknown revision 'not-a-branch'!

1463

abort: unknown revision 'not-a-branch'!

1465

abort: unknown revision 'not-a-branch'!

1464

abort: unknown revision 'not-a-branch'!

1466

abort: unknown revision 'not-a-branch'!

1465

abort: unknown revision 'not-a-branch'!

1467

$ testlog -b 35 -b 36 --only-branch branch

1466

$ testlog -b 35 -b 36 --only-branch branch

1468

[]

1467

[]

1469

(group

1468

(group

1470

(group

1469

(group

1471

(or

1470

(or

1472

(or

1471

(or

1473

(func

1472

(func

1474

('symbol', 'branch')

1473

('symbol', 'branch')

1475

('string', 'default'))

1474

('string', 'default'))

1476

(func

1475

(func

1477

('symbol', 'branch')

1476

('symbol', 'branch')

1478

('string', 'branch')))

1477

('string', 'branch')))

1479

(func

1478

(func

1480

('symbol', 'branch')

1479

('symbol', 'branch')

1481

('string', 'branch')))))

1480

('string', 'branch')))))

1482

$ testlog -k expand -k merge

1481

$ testlog -k expand -k merge

1483

[]

1482

[]

1484

(group

1483

(group

1485

(group

1484

(group

1486

(or

1485

(or

1487

(func

1486

(func

1488

('symbol', 'keyword')

1487

('symbol', 'keyword')

1489

('string', 'expand'))

1488

('string', 'expand'))

1490

(func

1489

(func

1491

('symbol', 'keyword')

1490

('symbol', 'keyword')

1492

('string', 'merge')))))

1491

('string', 'merge')))))

1493

$ testlog --only-merges

1492

$ testlog --only-merges

1494

[]

1493

[]

1495

(group

1494

(group

1496

(func

1495

(func

1497

('symbol', 'merge')

1496

('symbol', 'merge')

1498

None))

1497

None))

1499

$ testlog --no-merges

1498

$ testlog --no-merges

1500

[]

1499

[]

1501

(group

1500

(group

1502

(not

1501

(not

1503

(func

1502

(func

1504

('symbol', 'merge')

1503

('symbol', 'merge')

1505

None)))

1504

None)))

1506

$ testlog --date '2 0 to 4 0'

1505

$ testlog --date '2 0 to 4 0'

1507

[]

1506

[]

1508

(group

1507

(group

1509

(func

1508

(func

1510

('symbol', 'date')

1509

('symbol', 'date')

1511

('string', '2 0 to 4 0')))

1510

('string', '2 0 to 4 0')))

1512

$ hg log -G -d 'brace ) in a date'

1511

$ hg log -G -d 'brace ) in a date'

1513

abort: invalid date: 'brace ) in a date'

1512

abort: invalid date: 'brace ) in a date'

1514

[255]

1513

[255]

1515

$ testlog --prune 31 --prune 32

1514

$ testlog --prune 31 --prune 32

1516

[]

1515

[]

1517

(group

1516

(group

1518

(group

1517

(group

1519

(and

1518

(and

1520

(not

1519

(not

1521

(group

1520

(group

1522

(or

1521

(or

1523

('string', '31')

1522

('string', '31')

1524

(func

1523

(func

1525

('symbol', 'ancestors')

1524

('symbol', 'ancestors')

1526

('string', '31')))))

1525

('string', '31')))))

1527

(not

1526

(not

1528

(group

1527

(group

1529

(or

1528

(or

1530

('string', '32')

1529

('string', '32')

1531

(func

1530

(func

1532

('symbol', 'ancestors')

1531

('symbol', 'ancestors')

1533

('string', '32'))))))))

1532

('string', '32'))))))))

1534

1533

1535

Dedicated repo for --follow and paths filtering. The g is crafted to

1534

Dedicated repo for --follow and paths filtering. The g is crafted to

1536

have 2 filelog topological heads in a linear changeset graph.

1535

have 2 filelog topological heads in a linear changeset graph.

1537

1536

1538

$ cd ..

1537

$ cd ..

1539

$ hg init follow

1538

$ hg init follow

1540

$ cd follow

1539

$ cd follow

1541

$ testlog --follow

1540

$ testlog --follow

1542

[]

1541

[]

1543

[]

1542

[]

1544

$ echo a > a

1543

$ echo a > a

1545

$ echo aa > aa

1544

$ echo aa > aa

1546

$ echo f > f

1545

$ echo f > f

1547

$ hg ci -Am "add a" a aa f

1546

$ hg ci -Am "add a" a aa f

1548

$ hg cp a b

1547

$ hg cp a b

1549

$ hg cp f g

1548

$ hg cp f g

1550

$ hg ci -m "copy a b"

1549

$ hg ci -m "copy a b"

1551

$ mkdir dir

1550

$ mkdir dir

1552

$ hg mv b dir

1551

$ hg mv b dir

1553

$ echo g >> g

1552

$ echo g >> g

1554

$ echo f >> f

1553

$ echo f >> f

1555

$ hg ci -m "mv b dir/b"

1554

$ hg ci -m "mv b dir/b"

1556

$ hg mv a b

1555

$ hg mv a b

1557

$ hg cp -f f g

1556

$ hg cp -f f g

1558

$ echo a > d

1557

$ echo a > d

1559

$ hg add d

1558

$ hg add d

1560

$ hg ci -m "mv a b; add d"

1559

$ hg ci -m "mv a b; add d"

1561

$ hg mv dir/b e

1560

$ hg mv dir/b e

1562

$ hg ci -m "mv dir/b e"

1561

$ hg ci -m "mv dir/b e"

1563

$ hg glog --template '({rev}) {desc|firstline}\n'

1562

$ hg glog --template '({rev}) {desc|firstline}\n'

1564

@ (4) mv dir/b e

1563

@ (4) mv dir/b e

1565

|

1564

|

1566

o (3) mv a b; add d

1565

o (3) mv a b; add d

1567

|

1566

|

1568

o (2) mv b dir/b

1567

o (2) mv b dir/b

1569

|

1568

|

1570

o (1) copy a b

1569

o (1) copy a b

1571

|

1570

|

1572

o (0) add a

1571

o (0) add a

1573

1572

1574

1573

1575

$ testlog a

1574

$ testlog a

1576

[]

1575

[]

1577

(group

1576

(group

1578

(group

1577

(group

1579

(func

1578

(func

1580

('symbol', 'filelog')

1579

('symbol', 'filelog')

1581

('string', 'a'))))

1580

('string', 'a'))))

1582

$ testlog a b

1581

$ testlog a b

1583

[]

1582

[]

1584

(group

1583

(group

1585

(group

1584

(group

1586

(or

1585

(or

1587

(func

1586

(func

1588

('symbol', 'filelog')

1587

('symbol', 'filelog')

1589

('string', 'a'))

1588

('string', 'a'))

1590

(func

1589

(func

1591

('symbol', 'filelog')

1590

('symbol', 'filelog')

1592

('string', 'b')))))

1591

('string', 'b')))))

1593

1592

1594

Test falling back to slow path for non-existing files

1593

Test falling back to slow path for non-existing files

1595

1594

1596

$ testlog a c

1595

$ testlog a c

1597

[]

1596

[]

1598

(group

1597

(group

1599

(func

1598

(func

1600

('symbol', '_matchfiles')

1599

('symbol', '_matchfiles')

1601

(list

1600

(list

1602

(list

1601

(list

1603

(list

1602

(list

1604

('string', 'r:')

1603

('string', 'r:')

1605

('string', 'd:relpath'))

1604

('string', 'd:relpath'))

1606

('string', 'p:a'))

1605

('string', 'p:a'))

1607

('string', 'p:c'))))

1606

('string', 'p:c'))))

1608

1607

1609

Test multiple --include/--exclude/paths

1608

Test multiple --include/--exclude/paths

1610

1609

1611

$ testlog --include a --include e --exclude b --exclude e a e

1610

$ testlog --include a --include e --exclude b --exclude e a e

1612

[]

1611

[]

1613

(group

1612

(group

1614

(func

1613

(func

1615

('symbol', '_matchfiles')

1614

('symbol', '_matchfiles')

1616

(list

1615

(list

1617

(list

1616

(list

1618

(list

1617

(list

1619

(list

1618

(list

1620

(list

1619

(list

1621

(list

1620

(list

1622

(list

1621

(list

1623

('string', 'r:')

1622

('string', 'r:')

1624

('string', 'd:relpath'))

1623

('string', 'd:relpath'))

1625

('string', 'p:a'))

1624

('string', 'p:a'))

1626

('string', 'p:e'))

1625

('string', 'p:e'))

1627

('string', 'i:a'))

1626

('string', 'i:a'))

1628

('string', 'i:e'))

1627

('string', 'i:e'))

1629

('string', 'x:b'))

1628

('string', 'x:b'))

1630

('string', 'x:e'))))

1629

('string', 'x:e'))))

1631

1630

1632

Test glob expansion of pats

1631

Test glob expansion of pats

1633

1632

1634

$ expandglobs=`python -c "import mercurial.util; \

1633

$ expandglobs=`python -c "import mercurial.util; \

1635

> print mercurial.util.expandglobs and 'true' or 'false'"`

1634

> print mercurial.util.expandglobs and 'true' or 'false'"`

1636

$ if [ $expandglobs = "true" ]; then

1635

$ if [ $expandglobs = "true" ]; then

1637

> testlog 'a*';

1636

> testlog 'a*';

1638

> else

1637

> else

1639

> testlog a*;

1638

> testlog a*;

1640

> fi;

1639

> fi;

1641

[]

1640

[]

1642

(group

1641

(group

1643

(group

1642

(group

1644

(func

1643

(func

1645

('symbol', 'filelog')

1644

('symbol', 'filelog')

1646

('string', 'aa'))))

1645

('string', 'aa'))))

1647

1646

1648

Test --follow on a directory

1647

Test --follow on a directory

1649

1648

1650

$ testlog -f dir

1649

$ testlog -f dir

1651

abort: cannot follow file not in parent revision: "dir"

1650

abort: cannot follow file not in parent revision: "dir"

1652

abort: cannot follow file not in parent revision: "dir"

1651

abort: cannot follow file not in parent revision: "dir"

1653

abort: cannot follow file not in parent revision: "dir"

1652

abort: cannot follow file not in parent revision: "dir"

1654

1653

1655

Test --follow on file not in parent revision

1654

Test --follow on file not in parent revision

1656

1655

1657

$ testlog -f a

1656

$ testlog -f a

1658

abort: cannot follow file not in parent revision: "a"

1657

abort: cannot follow file not in parent revision: "a"

1659

abort: cannot follow file not in parent revision: "a"

1658

abort: cannot follow file not in parent revision: "a"

1660

abort: cannot follow file not in parent revision: "a"

1659

abort: cannot follow file not in parent revision: "a"

1661

1660

1662

Test --follow and patterns

1661

Test --follow and patterns

1663

1662

1664

$ testlog -f 'glob:*'

1663

$ testlog -f 'glob:*'

1665

abort: can only follow copies/renames for explicit filenames

1664

abort: can only follow copies/renames for explicit filenames

1666

abort: can only follow copies/renames for explicit filenames

1665

abort: can only follow copies/renames for explicit filenames

1667

abort: can only follow copies/renames for explicit filenames

1666

abort: can only follow copies/renames for explicit filenames

1668

1667

1669

Test --follow on a single rename

1668

Test --follow on a single rename

1670

1669

1671

$ hg up -q 2

1670

$ hg up -q 2

1672

$ testlog -f a

1671

$ testlog -f a

1673

[]

1672

[]

1674

(group

1673

(group

1675

(group

1674

(group

1676

(func

1675

(func

1677

('symbol', 'follow')

1676

('symbol', 'follow')

1678

('string', 'a'))))

1677

('string', 'a'))))

1679

1678

1680

Test --follow and multiple renames

1679

Test --follow and multiple renames

1681

1680

1682

$ hg up -q tip

1681

$ hg up -q tip

1683

$ testlog -f e

1682

$ testlog -f e

1684

[]

1683

[]

1685

(group

1684

(group

1686

(group

1685

(group

1687

(func

1686

(func

1688

('symbol', 'follow')

1687

('symbol', 'follow')

1689

('string', 'e'))))

1688

('string', 'e'))))

1690

1689

1691

Test --follow and multiple filelog heads

1690

Test --follow and multiple filelog heads

1692

1691

1693

$ hg up -q 2

1692

$ hg up -q 2

1694

$ testlog -f g

1693

$ testlog -f g

1695

[]

1694

[]

1696

(group

1695

(group

1697

(group

1696

(group

1698

(func

1697

(func

1699

('symbol', 'follow')

1698

('symbol', 'follow')

1700

('string', 'g'))))

1699

('string', 'g'))))

1701

$ cat log.nodes

1700

$ cat log.nodes

1702

nodetag 2

1701

nodetag 2

1703

nodetag 1

1702

nodetag 1

1704

nodetag 0

1703

nodetag 0

1705

$ hg up -q tip

1704

$ hg up -q tip

1706

$ testlog -f g

1705

$ testlog -f g

1707

[]

1706

[]

1708

(group

1707

(group

1709

(group

1708

(group

1710

(func

1709

(func

1711

('symbol', 'follow')

1710

('symbol', 'follow')

1712

('string', 'g'))))

1711

('string', 'g'))))

1713

$ cat log.nodes

1712

$ cat log.nodes

1714

nodetag 3

1713

nodetag 3

1715

nodetag 2

1714

nodetag 2

1716

nodetag 0

1715

nodetag 0

1717

1716

1718

Test --follow and multiple files

1717

Test --follow and multiple files

1719

1718

1720

$ testlog -f g e

1719

$ testlog -f g e

1721

[]

1720

[]

1722

(group

1721

(group

1723

(group

1722

(group

1724

(or

1723

(or

1725

(func

1724

(func

1726

('symbol', 'follow')

1725

('symbol', 'follow')

1727

('string', 'g'))

1726

('string', 'g'))

1728

(func

1727

(func

1729

('symbol', 'follow')

1728

('symbol', 'follow')

1730

('string', 'e')))))

1729

('string', 'e')))))

1731

$ cat log.nodes

1730

$ cat log.nodes

1732

nodetag 4

1731

nodetag 4

1733

nodetag 3

1732

nodetag 3

1734

nodetag 2

1733

nodetag 2

1735

nodetag 1

1734

nodetag 1

1736

nodetag 0

1735

nodetag 0

1737

1736

1738

Test --follow-first

1737

Test --follow-first

1739

1738

1740

$ hg up -q 3

1739

$ hg up -q 3

1741

$ echo ee > e

1740

$ echo ee > e

1742

$ hg ci -Am "add another e" e

1741

$ hg ci -Am "add another e" e

1743

created new head

1742

created new head

1744

$ hg merge --tool internal:other 4

1743

$ hg merge --tool internal:other 4

1745

0 files updated, 1 files merged, 1 files removed, 0 files unresolved

1744

0 files updated, 1 files merged, 1 files removed, 0 files unresolved

1746

(branch merge, don't forget to commit)

1745

(branch merge, don't forget to commit)

1747

$ echo merge > e

1746

$ echo merge > e

1748

$ hg ci -m "merge 5 and 4"

1747

$ hg ci -m "merge 5 and 4"

1749

$ testlog --follow-first

1748

$ testlog --follow-first

1750

[]

1749

[]

1751

(group

1750

(group

1752

(func

1751

(func

1753

('symbol', '_firstancestors')

1752

('symbol', '_firstancestors')

1754

('symbol', '6')))

1753

('symbol', '6')))

1755

1754

1756

Cannot compare with log --follow-first FILE as it never worked

1755

Cannot compare with log --follow-first FILE as it never worked

1757

1756

1758

$ hg log -G --print-revset --follow-first e

1757

$ hg log -G --print-revset --follow-first e

1759

[]

1758

[]

1760

(group

1759

(group

1761

(group

1760

(group

1762

(func

1761

(func

1763

('symbol', '_followfirst')

1762

('symbol', '_followfirst')

1764

('string', 'e'))))

1763

('string', 'e'))))

1765

$ hg log -G --follow-first e --template '{rev} {desc|firstline}\n'

1764

$ hg log -G --follow-first e --template '{rev} {desc|firstline}\n'

1766

@ 6 merge 5 and 4

1765

@ 6 merge 5 and 4

1767

|\

1766

|\

1768

o | 5 add another e

1767

o | 5 add another e

1769

| |

1768

| |

1770

1769

1771

Test --copies

1770

Test --copies

1772

1771

1773

$ hg log -G --copies --template "{rev} {desc|firstline} \

1772

$ hg log -G --copies --template "{rev} {desc|firstline} \

1774

> copies: {file_copies_switch}\n"

1773

> copies: {file_copies_switch}\n"

1775

@ 6 merge 5 and 4 copies:

1774

@ 6 merge 5 and 4 copies:

1776

|\

1775

|\

1777

| o 5 add another e copies:

1776

| o 5 add another e copies:

1778

| |

1777

| |

1779

o | 4 mv dir/b e copies: e (dir/b)

1778

o | 4 mv dir/b e copies: e (dir/b)

1780

|/

1779

|/

1781

o 3 mv a b; add d copies: b (a)g (f)

1780

o 3 mv a b; add d copies: b (a)g (f)

1782

|

1781

|

1783

o 2 mv b dir/b copies: dir/b (b)

1782

o 2 mv b dir/b copies: dir/b (b)

1784

|

1783

|

1785

o 1 copy a b copies: b (a)g (f)

1784

o 1 copy a b copies: b (a)g (f)

1786

|

1785

|

1787

o 0 add a copies:

1786

o 0 add a copies:

1788

1787

1789

Test "set:..." and parent revision

1788

Test "set:..." and parent revision

1790

1789

1791

$ hg up -q 4

1790

$ hg up -q 4

1792

$ testlog "set:copied()"

1791

$ testlog "set:copied()"

1793

[]

1792

[]

1794

(group

1793

(group

1795

(func

1794

(func

1796

('symbol', '_matchfiles')

1795

('symbol', '_matchfiles')

1797

(list

1796

(list

1798

(list

1797

(list

1799

('string', 'r:')

1798

('string', 'r:')

1800

('string', 'd:relpath'))

1799

('string', 'd:relpath'))

1801

('string', 'p:set:copied()'))))

1800

('string', 'p:set:copied()'))))

1802

$ testlog --include "set:copied()"

1801

$ testlog --include "set:copied()"

1803

[]

1802

[]

1804

(group

1803

(group

1805

(func

1804

(func

1806

('symbol', '_matchfiles')

1805

('symbol', '_matchfiles')

1807

(list

1806

(list

1808

(list

1807

(list

1809

('string', 'r:')

1808

('string', 'r:')

1810

('string', 'd:relpath'))

1809

('string', 'd:relpath'))

1811

('string', 'i:set:copied()'))))

1810

('string', 'i:set:copied()'))))

1812

$ testlog -r "sort(file('set:copied()'), -rev)"

1811

$ testlog -r "sort(file('set:copied()'), -rev)"

1813

["sort(file('set:copied()'), -rev)"]

1812

["sort(file('set:copied()'), -rev)"]

1814

[]

1813

[]

1815

1814

1816

Test --removed

1815

Test --removed

1817

1816

1818

$ testlog --removed

1817

$ testlog --removed

1819

[]

1818

[]

1820

[]

1819

[]

1821

$ testlog --removed a

1820

$ testlog --removed a

1822

[]

1821

[]

1823

(group

1822

(group

1824

(func

1823

(func

1825

('symbol', '_matchfiles')

1824

('symbol', '_matchfiles')

1826

(list

1825

(list

1827

(list

1826

(list

1828

('string', 'r:')

1827

('string', 'r:')

1829

('string', 'd:relpath'))

1828

('string', 'd:relpath'))

1830

('string', 'p:a'))))

1829

('string', 'p:a'))))

1831

$ testlog --removed --follow a

1830

$ testlog --removed --follow a

1832

abort: can only follow copies/renames for explicit filenames

1831

abort: can only follow copies/renames for explicit filenames

1833

abort: can only follow copies/renames for explicit filenames

1832

abort: can only follow copies/renames for explicit filenames

1834

abort: can only follow copies/renames for explicit filenames

1833

abort: can only follow copies/renames for explicit filenames

1835

1834

1836

Test --patch and --stat with --follow and --follow-first

1835

Test --patch and --stat with --follow and --follow-first

1837

1836

1838

$ hg up -q 3

1837

$ hg up -q 3

1839

$ hg log -G --git --patch b

1838

$ hg log -G --git --patch b

1840

o changeset: 1:216d4c92cf98

1839

o changeset: 1:216d4c92cf98

1841

| user: test

1840

| user: test

1842

| date: Thu Jan 01 00:00:00 1970 +0000

1841

| date: Thu Jan 01 00:00:00 1970 +0000

1843

| summary: copy a b

1842

| summary: copy a b

1844

|

1843

|

1845

| diff --git a/a b/b

1844

| diff --git a/a b/b

1846

| copy from a

1845

| copy from a

1847

| copy to b

1846

| copy to b

1848

|

1847

|

1849

1848

1850

$ hg log -G --git --stat b

1849

$ hg log -G --git --stat b

1851

o changeset: 1:216d4c92cf98

1850

o changeset: 1:216d4c92cf98

1852

| user: test

1851

| user: test

1853

| date: Thu Jan 01 00:00:00 1970 +0000

1852

| date: Thu Jan 01 00:00:00 1970 +0000

1854

| summary: copy a b

1853

| summary: copy a b

1855

|

1854

|

1856

| a | 0

1855

| a | 0

1857

| 1 files changed, 0 insertions(+), 0 deletions(-)

1856

| 1 files changed, 0 insertions(+), 0 deletions(-)

1858

|

1857

|

1859

1858

1860

$ hg log -G --git --patch --follow b

1859

$ hg log -G --git --patch --follow b

1861

o changeset: 1:216d4c92cf98

1860

o changeset: 1:216d4c92cf98

1862

| user: test

1861

| user: test

1863

| date: Thu Jan 01 00:00:00 1970 +0000

1862

| date: Thu Jan 01 00:00:00 1970 +0000

1864

| summary: copy a b

1863

| summary: copy a b

1865

|

1864

|

1866

| diff --git a/a b/b

1865

| diff --git a/a b/b

1867

| copy from a

1866

| copy from a

1868

| copy to b

1867

| copy to b

1869

|

1868

|

1870

o changeset: 0:f8035bb17114

1869

o changeset: 0:f8035bb17114

1871

user: test

1870

user: test

1872

date: Thu Jan 01 00:00:00 1970 +0000

1871

date: Thu Jan 01 00:00:00 1970 +0000

1873

summary: add a

1872

summary: add a

1874

1873

1875

diff --git a/a b/a

1874

diff --git a/a b/a

1876

new file mode 100644

1875

new file mode 100644

1877

--- /dev/null

1876

--- /dev/null

1878

+++ b/a

1877

+++ b/a

1879

@@ -0,0 +1,1 @@

1878

@@ -0,0 +1,1 @@

1880

+a

1879

+a

1881

1880

1882

1881

1883

$ hg log -G --git --stat --follow b

1882

$ hg log -G --git --stat --follow b

1884

o changeset: 1:216d4c92cf98

1883

o changeset: 1:216d4c92cf98

1885

| user: test

1884

| user: test

1886

| date: Thu Jan 01 00:00:00 1970 +0000

1885

| date: Thu Jan 01 00:00:00 1970 +0000

1887

| summary: copy a b

1886

| summary: copy a b

1888

|

1887

|

1889

| a | 0

1888

| a | 0

1890

| 1 files changed, 0 insertions(+), 0 deletions(-)

1889

| 1 files changed, 0 insertions(+), 0 deletions(-)

1891

|

1890

|

1892

o changeset: 0:f8035bb17114

1891

o changeset: 0:f8035bb17114

1893

user: test

1892

user: test

1894

date: Thu Jan 01 00:00:00 1970 +0000

1893

date: Thu Jan 01 00:00:00 1970 +0000

1895

summary: add a

1894

summary: add a

1896

1895

1897

a | 1 +

1896

a | 1 +

1898

1 files changed, 1 insertions(+), 0 deletions(-)

1897

1 files changed, 1 insertions(+), 0 deletions(-)

1899

1898

1900

1899

1901

$ hg up -q 6

1900

$ hg up -q 6

1902

$ hg log -G --git --patch --follow-first e

1901

$ hg log -G --git --patch --follow-first e

1903

@ changeset: 6:fc281d8ff18d

1902

@ changeset: 6:fc281d8ff18d

1904

|\ tag: tip

1903

|\ tag: tip

1905

| | parent: 5:99b31f1c2782

1904

| | parent: 5:99b31f1c2782

1906

| | parent: 4:17d952250a9d

1905

| | parent: 4:17d952250a9d

1907

| | user: test

1906

| | user: test

1908

| | date: Thu Jan 01 00:00:00 1970 +0000

1907

| | date: Thu Jan 01 00:00:00 1970 +0000

1909

| | summary: merge 5 and 4

1908

| | summary: merge 5 and 4

1910

| |

1909

| |

1911

| | diff --git a/e b/e

1910

| | diff --git a/e b/e

1912

| | --- a/e

1911

| | --- a/e

1913

| | +++ b/e

1912

| | +++ b/e

1914

| | @@ -1,1 +1,1 @@

1913

| | @@ -1,1 +1,1 @@

1915

| | -ee

1914

| | -ee

1916

| | +merge

1915

| | +merge

1917

| |

1916

| |

1918

o | changeset: 5:99b31f1c2782

1917

o | changeset: 5:99b31f1c2782

1919

| | parent: 3:5918b8d165d1

1918

| | parent: 3:5918b8d165d1

1920

| | user: test

1919

| | user: test

1921

| | date: Thu Jan 01 00:00:00 1970 +0000

1920

| | date: Thu Jan 01 00:00:00 1970 +0000

1922

| | summary: add another e

1921

| | summary: add another e

1923

| |

1922

| |

1924

| | diff --git a/e b/e

1923

| | diff --git a/e b/e

1925

| | new file mode 100644

1924

| | new file mode 100644

1926

| | --- /dev/null

1925

| | --- /dev/null

1927

| | +++ b/e

1926

| | +++ b/e

1928

| | @@ -0,0 +1,1 @@

1927

| | @@ -0,0 +1,1 @@

1929

| | +ee

1928

| | +ee

1930

| |

1929

| |

1931

1930

1932

Test old-style --rev

1931

Test old-style --rev

1933

1932

1934

$ hg tag 'foo-bar'

1933

$ hg tag 'foo-bar'

1935

$ testlog -r 'foo-bar'

1934

$ testlog -r 'foo-bar'

1936

['foo-bar']

1935

['foo-bar']

1937

[]

1936

[]

1938

1937

1939

Test --follow and forward --rev

1938

Test --follow and forward --rev

1940

1939

1941

$ hg up -q 6

1940

$ hg up -q 6

1942

$ echo g > g

1941

$ echo g > g

1943

$ hg ci -Am 'add g' g

1942

$ hg ci -Am 'add g' g

1944

created new head

1943

created new head

1945

$ hg up -q 2

1944

$ hg up -q 2

1946

$ hg log -G --template "{rev} {desc|firstline}\n"

1945

$ hg log -G --template "{rev} {desc|firstline}\n"

1947

o 8 add g

1946

o 8 add g

1948

|

1947

|

1949

| o 7 Added tag foo-bar for changeset fc281d8ff18d

1948

| o 7 Added tag foo-bar for changeset fc281d8ff18d

1950

|/

1949

|/

1951

o 6 merge 5 and 4

1950

o 6 merge 5 and 4

1952

|\

1951

|\

1953

| o 5 add another e

1952

| o 5 add another e

1954

| |

1953

| |

1955

o | 4 mv dir/b e

1954

o | 4 mv dir/b e

1956

|/

1955

|/

1957

o 3 mv a b; add d

1956

o 3 mv a b; add d

1958

|

1957

|

1959

@ 2 mv b dir/b

1958

@ 2 mv b dir/b

1960

|

1959

|

1961

o 1 copy a b

1960

o 1 copy a b

1962

|

1961

|

1963

o 0 add a

1962

o 0 add a

1964

1963

1965

$ testlog --follow -r6 -r8 -r5 -r7 -r4

1964

$ testlog --follow -r6 -r8 -r5 -r7 -r4

1966

['6', '8', '5', '7', '4']

1965

['6', '8', '5', '7', '4']

1967

(group

1966

(group

1968

(func

1967

(func

1969

('symbol', 'descendants')

1968

('symbol', 'descendants')

1970

('symbol', '6')))

1969

('symbol', '6')))

1971

--- log.nodes * (glob)

1970

--- log.nodes * (glob)

1972

+++ glog.nodes * (glob)

1971

+++ glog.nodes * (glob)

1973

@@ -1,3 +1,3 @@

1972

@@ -1,3 +1,3 @@

1974

-nodetag 6

1973

-nodetag 6

1975

nodetag 8

1974

nodetag 8

1976

nodetag 7

1975

nodetag 7

1977

+nodetag 6

1976

+nodetag 6

1978

[1]

1979

1977

1980

Test --follow-first and forward --rev

1978

Test --follow-first and forward --rev

1981

1979

1982

$ testlog --follow-first -r6 -r8 -r5 -r7 -r4

1980

$ testlog --follow-first -r6 -r8 -r5 -r7 -r4

1983

['6', '8', '5', '7', '4']

1981

['6', '8', '5', '7', '4']

1984

(group

1982

(group

1985

(func

1983

(func

1986

('symbol', '_firstdescendants')

1984

('symbol', '_firstdescendants')

1987

('symbol', '6')))

1985

('symbol', '6')))

1988

--- log.nodes * (glob)

1986

--- log.nodes * (glob)

1989

+++ glog.nodes * (glob)

1987

+++ glog.nodes * (glob)

1990

@@ -1,3 +1,3 @@

1988

@@ -1,3 +1,3 @@

1991

-nodetag 6

1989

-nodetag 6

1992

nodetag 8

1990

nodetag 8

1993

nodetag 7

1991

nodetag 7

1994

+nodetag 6

1992

+nodetag 6

1995

[1]

1996

1993

1997

Test --follow and backward --rev

1994

Test --follow and backward --rev

1998

1995

1999

$ testlog --follow -r6 -r5 -r7 -r8 -r4

1996

$ testlog --follow -r6 -r5 -r7 -r8 -r4

2000

['6', '5', '7', '8', '4']

1997

['6', '5', '7', '8', '4']

2001

(group

1998

(group

2002

(func

1999

(func

2003

('symbol', 'ancestors')

2000

('symbol', 'ancestors')

2004

('symbol', '6')))

2001

('symbol', '6')))

2005

2002

2006

Test --follow-first and backward --rev

2003

Test --follow-first and backward --rev

2007

2004

2008

$ testlog --follow-first -r6 -r5 -r7 -r8 -r4

2005

$ testlog --follow-first -r6 -r5 -r7 -r8 -r4

2009

['6', '5', '7', '8', '4']

2006

['6', '5', '7', '8', '4']

2010

(group

2007

(group

2011

(func

2008

(func

2012

('symbol', '_firstancestors')

2009

('symbol', '_firstancestors')

2013

('symbol', '6')))

2010

('symbol', '6')))

2014

2011

2015

Test subdir

2012

Test subdir

2016

2013

2017

$ hg up -q 3

2014

$ hg up -q 3

2018

$ cd dir

2015

$ cd dir

2019

$ testlog .

2016

$ testlog .

2020

[]

2017

[]

2021

(group

2018

(group

2022

(func

2019

(func

2023

('symbol', '_matchfiles')

2020

('symbol', '_matchfiles')

2024

(list

2021

(list

2025

(list

2022

(list

2026

('string', 'r:')

2023

('string', 'r:')

2027

('string', 'd:relpath'))

2024

('string', 'd:relpath'))

2028

('string', 'p:.'))))

2025

('string', 'p:.'))))

2029

$ testlog ../b

2026

$ testlog ../b

2030

[]

2027

[]

2031

(group

2028

(group

2032

(group

2029

(group

2033

(func

2030

(func

2034

('symbol', 'filelog')

2031

('symbol', 'filelog')

2035

('string', '../b'))))

2032

('string', '../b'))))

2036

$ testlog -f ../b

2033

$ testlog -f ../b

2037

[]

2034

[]

2038

(group

2035

(group

2039

(group

2036

(group

2040

(func

2037

(func

2041

('symbol', 'follow')

2038

('symbol', 'follow')

2042

('string', 'b'))))

2039

('string', 'b'))))

2043

$ cd ..

2040

$ cd ..

2044

2041

2045

Test --hidden

2042

Test --hidden

2046

2043

2047

$ cat > $HGTMP/testhidden.py << EOF

2044

$ cat > $HGTMP/testhidden.py << EOF

2048

> def reposetup(ui, repo):

2045

> def reposetup(ui, repo):

2049

> for line in repo.opener('hidden'):

2046

> for line in repo.opener('hidden'):

2050

> ctx = repo[line.strip()]

2047

> ctx = repo[line.strip()]

2051

> repo.changelog.hiddenrevs.add(ctx.rev())

2048

> repo.changelog.hiddenrevs.add(ctx.rev())

2052

> EOF

2049

> EOF

2053

$ echo '[extensions]' >> .hg/hgrc

2050

$ echo '[extensions]' >> .hg/hgrc

2054

$ echo "hidden=$HGTMP/testhidden.py" >> .hg/hgrc

2051

$ echo "hidden=$HGTMP/testhidden.py" >> .hg/hgrc

2055

$ hg id --debug -i -r 0 > .hg/hidden

2052

$ hg id --debug -i -r 0 > .hg/hidden

2056

$ testlog

2053

$ testlog

2057

[]

2054

[]

2058

[]

2055

[]

2059

$ testlog --hidden

2056

$ testlog --hidden

2060

[]

2057

[]

2061

[]

2058

[]

	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

             @  (34) head
             |
             | o  (33) head
             | |
             o |    (32) expand
             |\ \
             | o \    (31) expand
             | |\ \
             | | o \    (30) expand
             | | |\ \
             | | | o |  (29) regular commit
             | | | | |
             | | o | |    (28) merge zero known
             | | |\ \ \
             o | | | | |  (27) collapse
             |/ / / / /
             | | o---+  (26) merge one known; far right
             | | | | |
             +---o | |  (25) merge one known; far left
             | | | | |
             | | o | |  (24) merge one known; immediate right
             | | |\| |
             | | o | |  (23) merge one known; immediate left
             | |/| | |
             +---o---+  (22) merge two known; one far left, one far right
             | |  / /
             o | | |    (21) expand
             |\ \ \ \
             | o---+-+  (20) merge two known; two far right
             |  / / /
             o | | |    (19) expand
             |\ \ \ \
             +---+---o  (18) merge two known; two far left
             | | | |
             | o | |    (17) expand
             | |\ \ \
             | | o---+  (16) merge two known; one immediate right, one near right
             | | |/ /
             o | | |    (15) expand
             |\ \ \ \
             | o-----+  (14) merge two known; one immediate right, one far right
             | |/ / /
             o | | |    (13) expand
             |\ \ \ \
             +---o | |  (12) merge two known; one immediate right, one far left
             | | |/ /
             | o | |    (11) expand
             | |\ \ \
             | | o---+  (10) merge two known; one immediate left, one near right
             | |/ / /
             o | | |    (9) expand
             |\ \ \ \
             | o-----+  (8) merge two known; one immediate left, one far right
             |/ / / /
             o | | |    (7) expand
             |\ \ \ \
             +---o | |  (6) merge two known; one immediate left, one far left
             | |/ / /
             | o | |    (5) expand
             | |\ \ \
             | | o | |  (4) merge two known; one immediate left, one immediate right
             | |/|/ /
             | o / /  (3) collapse
             |/ / /
             o / /  (2) collapse
             |/ /
             o /  (1) collapse
             |/
             o  (0) root
               $ "$TESTDIR/hghave" no-outer-repo || exit 80
               $ commit()
               > {
               >   rev=$1
               >   msg=$2
               >   shift 2
               >   if [ "$#" -gt 0 ]; then
               >       hg debugsetparents "$@"
               >   fi
               >   echo $rev > a
               >   hg commit -Aqd "$rev 0" -m "($rev) $msg"
               > }
               $ cat > printrevset.py <<EOF
               > from mercurial import extensions, revset, commands
               > from hgext import graphlog
               >
               > def uisetup(ui):
               >     def printrevset(orig, ui, repo, *pats, **opts):
               >         if opts.get('print_revset'):
               >             expr = graphlog.getlogrevs(repo, pats, opts)[1]
               >             if expr:
               >                 tree = revset.parse(expr)[0]
               >             else:
               >                 tree = []
               >             ui.write('%r\n' % (opts.get('rev', []),))
               >             ui.write(revset.prettyformat(tree) + '\n')
               >             return 0
               >         return orig(ui, repo, *pats, **opts)
               >     entry = extensions.wrapcommand(commands.table, 'log', printrevset)
               >     entry[1].append(('', 'print-revset', False,
               >                      'print generated revset and exit (DEPRECATED)'))
               > EOF
               $ echo "[extensions]" >> $HGRCPATH
               $ echo "graphlog=" >> $HGRCPATH
               $ echo "printrevset=`pwd`/printrevset.py" >> $HGRCPATH
               $ hg init repo
               $ cd repo
             Empty repo:
               $ hg glog
             Building DAG:
               $ commit 0 "root"
               $ commit 1 "collapse" 0
               $ commit 2 "collapse" 1
               $ commit 3 "collapse" 2
               $ commit 4 "merge two known; one immediate left, one immediate right" 1 3
               $ commit 5 "expand" 3 4
               $ commit 6 "merge two known; one immediate left, one far left" 2 5
               $ commit 7 "expand" 2 5
               $ commit 8 "merge two known; one immediate left, one far right" 0 7
               $ commit 9 "expand" 7 8
               $ commit 10 "merge two known; one immediate left, one near right" 0 6
               $ commit 11 "expand" 6 10
               $ commit 12 "merge two known; one immediate right, one far left" 1 9
               $ commit 13 "expand" 9 11
               $ commit 14 "merge two known; one immediate right, one far right" 0 12
               $ commit 15 "expand" 13 14
               $ commit 16 "merge two known; one immediate right, one near right" 0 1
               $ commit 17 "expand" 12 16
               $ commit 18 "merge two known; two far left" 1 15
               $ commit 19 "expand" 15 17
               $ commit 20 "merge two known; two far right" 0 18
               $ commit 21 "expand" 19 20
               $ commit 22 "merge two known; one far left, one far right" 18 21
               $ commit 23 "merge one known; immediate left" 1 22
               $ commit 24 "merge one known; immediate right" 0 23
               $ commit 25 "merge one known; far left" 21 24
               $ commit 26 "merge one known; far right" 18 25
               $ commit 27 "collapse" 21
               $ commit 28 "merge zero known" 1 26
               $ commit 29 "regular commit" 0
               $ commit 30 "expand" 28 29
               $ commit 31 "expand" 21 30
               $ commit 32 "expand" 27 31
               $ commit 33 "head" 18
               $ commit 34 "head" 32
               $ hg glog -q
               @  34:fea3ac5810e0
               |
               | o  33:68608f5145f9
               | |
               o |    32:d06dffa21a31
               |\ \
               | o \    31:621d83e11f67
               | |\ \
               | | o \    30:6e11cd4b648f
               | | |\ \
               | | | o |  29:cd9bb2be7593
               | | | | |
               | | o | |    28:44ecd0b9ae99
               | | |\ \ \
               o | | | | |  27:886ed638191b
               |/ / / / /
               | | o---+  26:7f25b6c2f0b9
               | | | | |
               +---o | |  25:91da8ed57247
               | | | | |
               | | o | |  24:a9c19a3d96b7
               | | |\| |
               | | o | |  23:a01cddf0766d
               | |/| | |
               +---o---+  22:e0d9cccacb5d
               | |  / /
               o | | |    21:d42a756af44d
               |\ \ \ \
               | o---+-+  20:d30ed6450e32
               |  / / /
               o | | |    19:31ddc2c1573b
               |\ \ \ \
               +---+---o  18:1aa84d96232a
               | | | |
               | o | |    17:44765d7c06e0
               | |\ \ \
               | | o---+  16:3677d192927d
               | | |/ /
               o | | |    15:1dda3f72782d
               |\ \ \ \
               | o-----+  14:8eac370358ef
               | |/ / /
               o | | |    13:22d8966a97e3
               |\ \ \ \
               +---o | |  12:86b91144a6e9
               | | |/ /
               | o | |    11:832d76e6bdf2
               | |\ \ \
               | | o---+  10:74c64d036d72
               | |/ / /
               o | | |    9:7010c0af0a35
               |\ \ \ \
               | o-----+  8:7a0b11f71937
               |/ / / /
               o | | |    7:b632bb1b1224
               |\ \ \ \
               +---o | |  6:b105a072e251
               | |/ / /
               | o | |    5:4409d547b708
               | |\ \ \
               | | o | |  4:26a8bac39d9f
               | |/|/ /
               | o / /  3:27eef8ed80b4
               |/ / /
               o / /  2:3d9a33b8d1e1
               |/ /
               o /  1:6db2ef61d156
               |/
               o  0:e6eb3150255d
               $ hg glog
               @  changeset:   34:fea3ac5810e0
               |  tag:         tip
               |  parent:      32:d06dffa21a31
               |  user:        test
               |  date:        Thu Jan 01 00:00:34 1970 +0000
               |  summary:     (34) head
               |
               | o  changeset:   33:68608f5145f9
               | |  parent:      18:1aa84d96232a
               | |  user:        test
               | |  date:        Thu Jan 01 00:00:33 1970 +0000
               | |  summary:     (33) head
               | |
               o |    changeset:   32:d06dffa21a31
               |\ \   parent:      27:886ed638191b
               | | |  parent:      31:621d83e11f67
               | | |  user:        test
               | | |  date:        Thu Jan 01 00:00:32 1970 +0000
               | | |  summary:     (32) expand
               | | |
               | o |    changeset:   31:621d83e11f67
               | |\ \   parent:      21:d42a756af44d
               | | | |  parent:      30:6e11cd4b648f
               | | | |  user:        test
               | | | |  date:        Thu Jan 01 00:00:31 1970 +0000
               | | | |  summary:     (31) expand
               | | | |
               | | o |    changeset:   30:6e11cd4b648f
               | | |\ \   parent:      28:44ecd0b9ae99
               | | | | |  parent:      29:cd9bb2be7593
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:30 1970 +0000
               | | | | |  summary:     (30) expand
               | | | | |
               | | | o |  changeset:   29:cd9bb2be7593
               | | | | |  parent:      0:e6eb3150255d
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:29 1970 +0000
               | | | | |  summary:     (29) regular commit
               | | | | |
               | | o | |    changeset:   28:44ecd0b9ae99
               | | |\ \ \   parent:      1:6db2ef61d156
               | | | | | |  parent:      26:7f25b6c2f0b9
               | | | | | |  user:        test
               | | | | | |  date:        Thu Jan 01 00:00:28 1970 +0000
               | | | | | |  summary:     (28) merge zero known
               | | | | | |
               o | | | | |  changeset:   27:886ed638191b
               |/ / / / /   parent:      21:d42a756af44d
               | | | | |    user:        test
               | | | | |    date:        Thu Jan 01 00:00:27 1970 +0000
               | | | | |    summary:     (27) collapse
               | | | | |
               | | o---+  changeset:   26:7f25b6c2f0b9
               | | | | |  parent:      18:1aa84d96232a
               | | | | |  parent:      25:91da8ed57247
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:26 1970 +0000
               | | | | |  summary:     (26) merge one known; far right
               | | | | |
               +---o | |  changeset:   25:91da8ed57247
               | | | | |  parent:      21:d42a756af44d
               | | | | |  parent:      24:a9c19a3d96b7
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:25 1970 +0000
               | | | | |  summary:     (25) merge one known; far left
               | | | | |
               | | o | |  changeset:   24:a9c19a3d96b7
               | | |\| |  parent:      0:e6eb3150255d
               | | | | |  parent:      23:a01cddf0766d
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:24 1970 +0000
               | | | | |  summary:     (24) merge one known; immediate right
               | | | | |
               | | o | |  changeset:   23:a01cddf0766d
               | |/| | |  parent:      1:6db2ef61d156
               | | | | |  parent:      22:e0d9cccacb5d
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:23 1970 +0000
               | | | | |  summary:     (23) merge one known; immediate left
               | | | | |
               +---o---+  changeset:   22:e0d9cccacb5d
               | |   | |  parent:      18:1aa84d96232a
               | |  / /   parent:      21:d42a756af44d
               | | | |    user:        test
               | | | |    date:        Thu Jan 01 00:00:22 1970 +0000
               | | | |    summary:     (22) merge two known; one far left, one far right
               | | | |
               o | | |    changeset:   21:d42a756af44d
               |\ \ \ \   parent:      19:31ddc2c1573b
               | | | | |  parent:      20:d30ed6450e32
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:21 1970 +0000
               | | | | |  summary:     (21) expand
               | | | | |
               | o---+-+  changeset:   20:d30ed6450e32
               |   | | |  parent:      0:e6eb3150255d
               |  / / /   parent:      18:1aa84d96232a
               | | | |    user:        test
               | | | |    date:        Thu Jan 01 00:00:20 1970 +0000
               | | | |    summary:     (20) merge two known; two far right
               | | | |
               o | | |    changeset:   19:31ddc2c1573b
               |\ \ \ \   parent:      15:1dda3f72782d
               | | | | |  parent:      17:44765d7c06e0
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:19 1970 +0000
               | | | | |  summary:     (19) expand
               | | | | |
               +---+---o  changeset:   18:1aa84d96232a
               | | | |    parent:      1:6db2ef61d156
               | | | |    parent:      15:1dda3f72782d
               | | | |    user:        test
               | | | |    date:        Thu Jan 01 00:00:18 1970 +0000
               | | | |    summary:     (18) merge two known; two far left
               | | | |
               | o | |    changeset:   17:44765d7c06e0
               | |\ \ \   parent:      12:86b91144a6e9
               | | | | |  parent:      16:3677d192927d
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:17 1970 +0000
               | | | | |  summary:     (17) expand
               | | | | |
               | | o---+  changeset:   16:3677d192927d
               | | | | |  parent:      0:e6eb3150255d
               | | |/ /   parent:      1:6db2ef61d156
               | | | |    user:        test
               | | | |    date:        Thu Jan 01 00:00:16 1970 +0000
               | | | |    summary:     (16) merge two known; one immediate right, one near right
               | | | |
               o | | |    changeset:   15:1dda3f72782d
               |\ \ \ \   parent:      13:22d8966a97e3
               | | | | |  parent:      14:8eac370358ef
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:15 1970 +0000
               | | | | |  summary:     (15) expand
               | | | | |
               | o-----+  changeset:   14:8eac370358ef
               | | | | |  parent:      0:e6eb3150255d
               | |/ / /   parent:      12:86b91144a6e9
               | | | |    user:        test
               | | | |    date:        Thu Jan 01 00:00:14 1970 +0000
               | | | |    summary:     (14) merge two known; one immediate right, one far right
               | | | |
               o | | |    changeset:   13:22d8966a97e3
               |\ \ \ \   parent:      9:7010c0af0a35
               | | | | |  parent:      11:832d76e6bdf2
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:13 1970 +0000
               | | | | |  summary:     (13) expand
               | | | | |
               +---o | |  changeset:   12:86b91144a6e9
               | | |/ /   parent:      1:6db2ef61d156
               | | | |    parent:      9:7010c0af0a35
               | | | |    user:        test
               | | | |    date:        Thu Jan 01 00:00:12 1970 +0000
               | | | |    summary:     (12) merge two known; one immediate right, one far left
               | | | |
               | o | |    changeset:   11:832d76e6bdf2
               | |\ \ \   parent:      6:b105a072e251
               | | | | |  parent:      10:74c64d036d72
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:11 1970 +0000
               | | | | |  summary:     (11) expand
               | | | | |
               | | o---+  changeset:   10:74c64d036d72
               | | | | |  parent:      0:e6eb3150255d
               | |/ / /   parent:      6:b105a072e251
               | | | |    user:        test
               | | | |    date:        Thu Jan 01 00:00:10 1970 +0000
               | | | |    summary:     (10) merge two known; one immediate left, one near right
               | | | |
               o | | |    changeset:   9:7010c0af0a35
               |\ \ \ \   parent:      7:b632bb1b1224
               | | | | |  parent:      8:7a0b11f71937
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:09 1970 +0000
               | | | | |  summary:     (9) expand
               | | | | |
               | o-----+  changeset:   8:7a0b11f71937
               | | | | |  parent:      0:e6eb3150255d
               |/ / / /   parent:      7:b632bb1b1224
               | | | |    user:        test
               | | | |    date:        Thu Jan 01 00:00:08 1970 +0000
               | | | |    summary:     (8) merge two known; one immediate left, one far right
               | | | |
               o | | |    changeset:   7:b632bb1b1224
               |\ \ \ \   parent:      2:3d9a33b8d1e1
               | | | | |  parent:      5:4409d547b708
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:07 1970 +0000
               | | | | |  summary:     (7) expand
               | | | | |
               +---o | |  changeset:   6:b105a072e251
               | |/ / /   parent:      2:3d9a33b8d1e1
               | | | |    parent:      5:4409d547b708
               | | | |    user:        test
               | | | |    date:        Thu Jan 01 00:00:06 1970 +0000
               | | | |    summary:     (6) merge two known; one immediate left, one far left
               | | | |
               | o | |    changeset:   5:4409d547b708
               | |\ \ \   parent:      3:27eef8ed80b4
               | | | | |  parent:      4:26a8bac39d9f
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:05 1970 +0000
               | | | | |  summary:     (5) expand
               | | | | |
               | | o | |  changeset:   4:26a8bac39d9f
               | |/|/ /   parent:      1:6db2ef61d156
               | | | |    parent:      3:27eef8ed80b4
               | | | |    user:        test
               | | | |    date:        Thu Jan 01 00:00:04 1970 +0000
               | | | |    summary:     (4) merge two known; one immediate left, one immediate right
               | | | |
               | o | |  changeset:   3:27eef8ed80b4
               |/ / /   user:        test
               | | |    date:        Thu Jan 01 00:00:03 1970 +0000
               | | |    summary:     (3) collapse
               | | |
               o | |  changeset:   2:3d9a33b8d1e1
               |/ /   user:        test
               | |    date:        Thu Jan 01 00:00:02 1970 +0000
               | |    summary:     (2) collapse
               | |
               o |  changeset:   1:6db2ef61d156
               |/   user:        test
               |    date:        Thu Jan 01 00:00:01 1970 +0000
               |    summary:     (1) collapse
               |
               o  changeset:   0:e6eb3150255d
                  user:        test
                  date:        Thu Jan 01 00:00:00 1970 +0000
                  summary:     (0) root
             File glog:
               $ hg glog a
               @  changeset:   34:fea3ac5810e0
               |  tag:         tip
               |  parent:      32:d06dffa21a31
               |  user:        test
               |  date:        Thu Jan 01 00:00:34 1970 +0000
               |  summary:     (34) head
               |
               | o  changeset:   33:68608f5145f9
               | |  parent:      18:1aa84d96232a
               | |  user:        test
               | |  date:        Thu Jan 01 00:00:33 1970 +0000
               | |  summary:     (33) head
               | |
               o |    changeset:   32:d06dffa21a31
               |\ \   parent:      27:886ed638191b
               | | |  parent:      31:621d83e11f67
               | | |  user:        test
               | | |  date:        Thu Jan 01 00:00:32 1970 +0000
               | | |  summary:     (32) expand
               | | |
               | o |    changeset:   31:621d83e11f67
               | |\ \   parent:      21:d42a756af44d
               | | | |  parent:      30:6e11cd4b648f
               | | | |  user:        test
               | | | |  date:        Thu Jan 01 00:00:31 1970 +0000
               | | | |  summary:     (31) expand
               | | | |
               | | o |    changeset:   30:6e11cd4b648f
               | | |\ \   parent:      28:44ecd0b9ae99
               | | | | |  parent:      29:cd9bb2be7593
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:30 1970 +0000
               | | | | |  summary:     (30) expand
               | | | | |
               | | | o |  changeset:   29:cd9bb2be7593
               | | | | |  parent:      0:e6eb3150255d
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:29 1970 +0000
               | | | | |  summary:     (29) regular commit
               | | | | |
               | | o | |    changeset:   28:44ecd0b9ae99
               | | |\ \ \   parent:      1:6db2ef61d156
               | | | | | |  parent:      26:7f25b6c2f0b9
               | | | | | |  user:        test
               | | | | | |  date:        Thu Jan 01 00:00:28 1970 +0000
               | | | | | |  summary:     (28) merge zero known
               | | | | | |
               o | | | | |  changeset:   27:886ed638191b
               |/ / / / /   parent:      21:d42a756af44d
               | | | | |    user:        test
               | | | | |    date:        Thu Jan 01 00:00:27 1970 +0000
               | | | | |    summary:     (27) collapse
               | | | | |
               | | o---+  changeset:   26:7f25b6c2f0b9
               | | | | |  parent:      18:1aa84d96232a
               | | | | |  parent:      25:91da8ed57247
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:26 1970 +0000
               | | | | |  summary:     (26) merge one known; far right
               | | | | |
               +---o | |  changeset:   25:91da8ed57247
               | | | | |  parent:      21:d42a756af44d
               | | | | |  parent:      24:a9c19a3d96b7
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:25 1970 +0000
               | | | | |  summary:     (25) merge one known; far left
               | | | | |
               | | o | |  changeset:   24:a9c19a3d96b7
               | | |\| |  parent:      0:e6eb3150255d
               | | | | |  parent:      23:a01cddf0766d
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:24 1970 +0000
               | | | | |  summary:     (24) merge one known; immediate right
               | | | | |
               | | o | |  changeset:   23:a01cddf0766d
               | |/| | |  parent:      1:6db2ef61d156
               | | | | |  parent:      22:e0d9cccacb5d
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:23 1970 +0000
               | | | | |  summary:     (23) merge one known; immediate left
               | | | | |
               +---o---+  changeset:   22:e0d9cccacb5d
               | |   | |  parent:      18:1aa84d96232a
               | |  / /   parent:      21:d42a756af44d
               | | | |    user:        test
               | | | |    date:        Thu Jan 01 00:00:22 1970 +0000
               | | | |    summary:     (22) merge two known; one far left, one far right
               | | | |
               o | | |    changeset:   21:d42a756af44d
               |\ \ \ \   parent:      19:31ddc2c1573b
               | | | | |  parent:      20:d30ed6450e32
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:21 1970 +0000
               | | | | |  summary:     (21) expand
               | | | | |
               | o---+-+  changeset:   20:d30ed6450e32
               |   | | |  parent:      0:e6eb3150255d
               |  / / /   parent:      18:1aa84d96232a
               | | | |    user:        test
               | | | |    date:        Thu Jan 01 00:00:20 1970 +0000
               | | | |    summary:     (20) merge two known; two far right
               | | | |
               o | | |    changeset:   19:31ddc2c1573b
               |\ \ \ \   parent:      15:1dda3f72782d
               | | | | |  parent:      17:44765d7c06e0
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:19 1970 +0000
               | | | | |  summary:     (19) expand
               | | | | |
               +---+---o  changeset:   18:1aa84d96232a
               | | | |    parent:      1:6db2ef61d156
               | | | |    parent:      15:1dda3f72782d
               | | | |    user:        test
               | | | |    date:        Thu Jan 01 00:00:18 1970 +0000
               | | | |    summary:     (18) merge two known; two far left
               | | | |
               | o | |    changeset:   17:44765d7c06e0
               | |\ \ \   parent:      12:86b91144a6e9
               | | | | |  parent:      16:3677d192927d
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:17 1970 +0000
               | | | | |  summary:     (17) expand
               | | | | |
               | | o---+  changeset:   16:3677d192927d
               | | | | |  parent:      0:e6eb3150255d
               | | |/ /   parent:      1:6db2ef61d156
               | | | |    user:        test
               | | | |    date:        Thu Jan 01 00:00:16 1970 +0000
               | | | |    summary:     (16) merge two known; one immediate right, one near right
               | | | |
               o | | |    changeset:   15:1dda3f72782d
               |\ \ \ \   parent:      13:22d8966a97e3
               | | | | |  parent:      14:8eac370358ef
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:15 1970 +0000
               | | | | |  summary:     (15) expand
               | | | | |
               | o-----+  changeset:   14:8eac370358ef
               | | | | |  parent:      0:e6eb3150255d
               | |/ / /   parent:      12:86b91144a6e9
               | | | |    user:        test
               | | | |    date:        Thu Jan 01 00:00:14 1970 +0000
               | | | |    summary:     (14) merge two known; one immediate right, one far right
               | | | |
               o | | |    changeset:   13:22d8966a97e3
               |\ \ \ \   parent:      9:7010c0af0a35
               | | | | |  parent:      11:832d76e6bdf2
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:13 1970 +0000
               | | | | |  summary:     (13) expand
               | | | | |
               +---o | |  changeset:   12:86b91144a6e9
               | | |/ /   parent:      1:6db2ef61d156
               | | | |    parent:      9:7010c0af0a35
               | | | |    user:        test
               | | | |    date:        Thu Jan 01 00:00:12 1970 +0000
               | | | |    summary:     (12) merge two known; one immediate right, one far left
               | | | |
               | o | |    changeset:   11:832d76e6bdf2
               | |\ \ \   parent:      6:b105a072e251
               | | | | |  parent:      10:74c64d036d72
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:11 1970 +0000
               | | | | |  summary:     (11) expand
               | | | | |
               | | o---+  changeset:   10:74c64d036d72
               | | | | |  parent:      0:e6eb3150255d
               | |/ / /   parent:      6:b105a072e251
               | | | |    user:        test
               | | | |    date:        Thu Jan 01 00:00:10 1970 +0000
               | | | |    summary:     (10) merge two known; one immediate left, one near right
               | | | |
               o | | |    changeset:   9:7010c0af0a35
               |\ \ \ \   parent:      7:b632bb1b1224
               | | | | |  parent:      8:7a0b11f71937
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:09 1970 +0000
               | | | | |  summary:     (9) expand
               | | | | |
               | o-----+  changeset:   8:7a0b11f71937
               | | | | |  parent:      0:e6eb3150255d
               |/ / / /   parent:      7:b632bb1b1224
               | | | |    user:        test
               | | | |    date:        Thu Jan 01 00:00:08 1970 +0000
               | | | |    summary:     (8) merge two known; one immediate left, one far right
               | | | |
               o | | |    changeset:   7:b632bb1b1224
               |\ \ \ \   parent:      2:3d9a33b8d1e1
               | | | | |  parent:      5:4409d547b708
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:07 1970 +0000
               | | | | |  summary:     (7) expand
               | | | | |
               +---o | |  changeset:   6:b105a072e251
               | |/ / /   parent:      2:3d9a33b8d1e1
               | | | |    parent:      5:4409d547b708
               | | | |    user:        test
               | | | |    date:        Thu Jan 01 00:00:06 1970 +0000
               | | | |    summary:     (6) merge two known; one immediate left, one far left
               | | | |
               | o | |    changeset:   5:4409d547b708
               | |\ \ \   parent:      3:27eef8ed80b4
               | | | | |  parent:      4:26a8bac39d9f
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:05 1970 +0000
               | | | | |  summary:     (5) expand
               | | | | |
               | | o | |  changeset:   4:26a8bac39d9f
               | |/|/ /   parent:      1:6db2ef61d156
               | | | |    parent:      3:27eef8ed80b4
               | | | |    user:        test
               | | | |    date:        Thu Jan 01 00:00:04 1970 +0000
               | | | |    summary:     (4) merge two known; one immediate left, one immediate right
               | | | |
               | o | |  changeset:   3:27eef8ed80b4
               |/ / /   user:        test
               | | |    date:        Thu Jan 01 00:00:03 1970 +0000
               | | |    summary:     (3) collapse
               | | |
               o | |  changeset:   2:3d9a33b8d1e1
               |/ /   user:        test
               | |    date:        Thu Jan 01 00:00:02 1970 +0000
               | |    summary:     (2) collapse
               | |
               o |  changeset:   1:6db2ef61d156
               |/   user:        test
               |    date:        Thu Jan 01 00:00:01 1970 +0000
               |    summary:     (1) collapse
               |
               o  changeset:   0:e6eb3150255d
                  user:        test
                  date:        Thu Jan 01 00:00:00 1970 +0000
                  summary:     (0) root
             File glog per revset:
               $ hg glog -r 'file("a")'
               @  changeset:   34:fea3ac5810e0
               |  tag:         tip
               |  parent:      32:d06dffa21a31
               |  user:        test
               |  date:        Thu Jan 01 00:00:34 1970 +0000
               |  summary:     (34) head
               |
               | o  changeset:   33:68608f5145f9
               | |  parent:      18:1aa84d96232a
               | |  user:        test
               | |  date:        Thu Jan 01 00:00:33 1970 +0000
               | |  summary:     (33) head
               | |
               o |    changeset:   32:d06dffa21a31
               |\ \   parent:      27:886ed638191b
               | | |  parent:      31:621d83e11f67
               | | |  user:        test
               | | |  date:        Thu Jan 01 00:00:32 1970 +0000
               | | |  summary:     (32) expand
               | | |
               | o |    changeset:   31:621d83e11f67
               | |\ \   parent:      21:d42a756af44d
               | | | |  parent:      30:6e11cd4b648f
               | | | |  user:        test
               | | | |  date:        Thu Jan 01 00:00:31 1970 +0000
               | | | |  summary:     (31) expand
               | | | |
               | | o |    changeset:   30:6e11cd4b648f
               | | |\ \   parent:      28:44ecd0b9ae99
               | | | | |  parent:      29:cd9bb2be7593
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:30 1970 +0000
               | | | | |  summary:     (30) expand
               | | | | |
               | | | o |  changeset:   29:cd9bb2be7593
               | | | | |  parent:      0:e6eb3150255d
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:29 1970 +0000
               | | | | |  summary:     (29) regular commit
               | | | | |
               | | o | |    changeset:   28:44ecd0b9ae99
               | | |\ \ \   parent:      1:6db2ef61d156
               | | | | | |  parent:      26:7f25b6c2f0b9
               | | | | | |  user:        test
               | | | | | |  date:        Thu Jan 01 00:00:28 1970 +0000
               | | | | | |  summary:     (28) merge zero known
               | | | | | |
               o | | | | |  changeset:   27:886ed638191b
               |/ / / / /   parent:      21:d42a756af44d
               | | | | |    user:        test
               | | | | |    date:        Thu Jan 01 00:00:27 1970 +0000
               | | | | |    summary:     (27) collapse
               | | | | |
               | | o---+  changeset:   26:7f25b6c2f0b9
               | | | | |  parent:      18:1aa84d96232a
               | | | | |  parent:      25:91da8ed57247
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:26 1970 +0000
               | | | | |  summary:     (26) merge one known; far right
               | | | | |
               +---o | |  changeset:   25:91da8ed57247
               | | | | |  parent:      21:d42a756af44d
               | | | | |  parent:      24:a9c19a3d96b7
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:25 1970 +0000
               | | | | |  summary:     (25) merge one known; far left
               | | | | |
               | | o | |  changeset:   24:a9c19a3d96b7
               | | |\| |  parent:      0:e6eb3150255d
               | | | | |  parent:      23:a01cddf0766d
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:24 1970 +0000
               | | | | |  summary:     (24) merge one known; immediate right
               | | | | |
               | | o | |  changeset:   23:a01cddf0766d
               | |/| | |  parent:      1:6db2ef61d156
               | | | | |  parent:      22:e0d9cccacb5d
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:23 1970 +0000
               | | | | |  summary:     (23) merge one known; immediate left
               | | | | |
               +---o---+  changeset:   22:e0d9cccacb5d
               | |   | |  parent:      18:1aa84d96232a
               | |  / /   parent:      21:d42a756af44d
               | | | |    user:        test
               | | | |    date:        Thu Jan 01 00:00:22 1970 +0000
               | | | |    summary:     (22) merge two known; one far left, one far right
               | | | |
               o | | |    changeset:   21:d42a756af44d
               |\ \ \ \   parent:      19:31ddc2c1573b
               | | | | |  parent:      20:d30ed6450e32
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:21 1970 +0000
               | | | | |  summary:     (21) expand
               | | | | |
               | o---+-+  changeset:   20:d30ed6450e32
               |   | | |  parent:      0:e6eb3150255d
               |  / / /   parent:      18:1aa84d96232a
               | | | |    user:        test
               | | | |    date:        Thu Jan 01 00:00:20 1970 +0000
               | | | |    summary:     (20) merge two known; two far right
               | | | |
               o | | |    changeset:   19:31ddc2c1573b
               |\ \ \ \   parent:      15:1dda3f72782d
               | | | | |  parent:      17:44765d7c06e0
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:19 1970 +0000
               | | | | |  summary:     (19) expand
               | | | | |
               +---+---o  changeset:   18:1aa84d96232a
               | | | |    parent:      1:6db2ef61d156
               | | | |    parent:      15:1dda3f72782d
               | | | |    user:        test
               | | | |    date:        Thu Jan 01 00:00:18 1970 +0000
               | | | |    summary:     (18) merge two known; two far left
               | | | |
               | o | |    changeset:   17:44765d7c06e0
               | |\ \ \   parent:      12:86b91144a6e9
               | | | | |  parent:      16:3677d192927d
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:17 1970 +0000
               | | | | |  summary:     (17) expand
               | | | | |
               | | o---+  changeset:   16:3677d192927d
               | | | | |  parent:      0:e6eb3150255d
               | | |/ /   parent:      1:6db2ef61d156
               | | | |    user:        test
               | | | |    date:        Thu Jan 01 00:00:16 1970 +0000
               | | | |    summary:     (16) merge two known; one immediate right, one near right
               | | | |
               o | | |    changeset:   15:1dda3f72782d
               |\ \ \ \   parent:      13:22d8966a97e3
               | | | | |  parent:      14:8eac370358ef
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:15 1970 +0000
               | | | | |  summary:     (15) expand
               | | | | |
               | o-----+  changeset:   14:8eac370358ef
               | | | | |  parent:      0:e6eb3150255d
               | |/ / /   parent:      12:86b91144a6e9
               | | | |    user:        test
               | | | |    date:        Thu Jan 01 00:00:14 1970 +0000
               | | | |    summary:     (14) merge two known; one immediate right, one far right
               | | | |
               o | | |    changeset:   13:22d8966a97e3
               |\ \ \ \   parent:      9:7010c0af0a35
               | | | | |  parent:      11:832d76e6bdf2
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:13 1970 +0000
               | | | | |  summary:     (13) expand
               | | | | |
               +---o | |  changeset:   12:86b91144a6e9
               | | |/ /   parent:      1:6db2ef61d156
               | | | |    parent:      9:7010c0af0a35
               | | | |    user:        test
               | | | |    date:        Thu Jan 01 00:00:12 1970 +0000
               | | | |    summary:     (12) merge two known; one immediate right, one far left
               | | | |
               | o | |    changeset:   11:832d76e6bdf2
               | |\ \ \   parent:      6:b105a072e251
               | | | | |  parent:      10:74c64d036d72
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:11 1970 +0000
               | | | | |  summary:     (11) expand
               | | | | |
               | | o---+  changeset:   10:74c64d036d72
               | | | | |  parent:      0:e6eb3150255d
               | |/ / /   parent:      6:b105a072e251
               | | | |    user:        test
               | | | |    date:        Thu Jan 01 00:00:10 1970 +0000
               | | | |    summary:     (10) merge two known; one immediate left, one near right
               | | | |
               o | | |    changeset:   9:7010c0af0a35
               |\ \ \ \   parent:      7:b632bb1b1224
               | | | | |  parent:      8:7a0b11f71937
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:09 1970 +0000
               | | | | |  summary:     (9) expand
               | | | | |
               | o-----+  changeset:   8:7a0b11f71937
               | | | | |  parent:      0:e6eb3150255d
               |/ / / /   parent:      7:b632bb1b1224
               | | | |    user:        test
               | | | |    date:        Thu Jan 01 00:00:08 1970 +0000
               | | | |    summary:     (8) merge two known; one immediate left, one far right
               | | | |
               o | | |    changeset:   7:b632bb1b1224
               |\ \ \ \   parent:      2:3d9a33b8d1e1
               | | | | |  parent:      5:4409d547b708
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:07 1970 +0000
               | | | | |  summary:     (7) expand
               | | | | |
               +---o | |  changeset:   6:b105a072e251
               | |/ / /   parent:      2:3d9a33b8d1e1
               | | | |    parent:      5:4409d547b708
               | | | |    user:        test
               | | | |    date:        Thu Jan 01 00:00:06 1970 +0000
               | | | |    summary:     (6) merge two known; one immediate left, one far left
               | | | |
               | o | |    changeset:   5:4409d547b708
               | |\ \ \   parent:      3:27eef8ed80b4
               | | | | |  parent:      4:26a8bac39d9f
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:05 1970 +0000
               | | | | |  summary:     (5) expand
               | | | | |
               | | o | |  changeset:   4:26a8bac39d9f
               | |/|/ /   parent:      1:6db2ef61d156
               | | | |    parent:      3:27eef8ed80b4
               | | | |    user:        test
               | | | |    date:        Thu Jan 01 00:00:04 1970 +0000
               | | | |    summary:     (4) merge two known; one immediate left, one immediate right
               | | | |
               | o | |  changeset:   3:27eef8ed80b4
               |/ / /   user:        test
               | | |    date:        Thu Jan 01 00:00:03 1970 +0000
               | | |    summary:     (3) collapse
               | | |
               o | |  changeset:   2:3d9a33b8d1e1
               |/ /   user:        test
               | |    date:        Thu Jan 01 00:00:02 1970 +0000
               | |    summary:     (2) collapse
               | |
               o |  changeset:   1:6db2ef61d156
               |/   user:        test
               |    date:        Thu Jan 01 00:00:01 1970 +0000
               |    summary:     (1) collapse
               |
               o  changeset:   0:e6eb3150255d
                  user:        test
                  date:        Thu Jan 01 00:00:00 1970 +0000
                  summary:     (0) root
             File glog per revset (only merges):
               $ hg log -G -r 'file("a")' -m
               o    changeset:   32:d06dffa21a31
               |\   parent:      27:886ed638191b
               | |  parent:      31:621d83e11f67
               | |  user:        test
               | |  date:        Thu Jan 01 00:00:32 1970 +0000
               | |  summary:     (32) expand
               | |
               o |  changeset:   31:621d83e11f67
               |\|  parent:      21:d42a756af44d
               | |  parent:      30:6e11cd4b648f
               | |  user:        test
               | |  date:        Thu Jan 01 00:00:31 1970 +0000
               | |  summary:     (31) expand
               | |
               o |    changeset:   30:6e11cd4b648f
               |\ \   parent:      28:44ecd0b9ae99
               | | |  parent:      29:cd9bb2be7593
               | | |  user:        test
               | | |  date:        Thu Jan 01 00:00:30 1970 +0000
               | | |  summary:     (30) expand
               | | |
               o | |    changeset:   28:44ecd0b9ae99
               |\ \ \   parent:      1:6db2ef61d156
               | | | |  parent:      26:7f25b6c2f0b9
               | | | |  user:        test
               | | | |  date:        Thu Jan 01 00:00:28 1970 +0000
               | | | |  summary:     (28) merge zero known
               | | | |
               o | | |    changeset:   26:7f25b6c2f0b9
               |\ \ \ \   parent:      18:1aa84d96232a
               | | | | |  parent:      25:91da8ed57247
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:26 1970 +0000
               | | | | |  summary:     (26) merge one known; far right
               | | | | |
               | o-----+  changeset:   25:91da8ed57247
               | | | | |  parent:      21:d42a756af44d
               | | | | |  parent:      24:a9c19a3d96b7
               | | | | |  user:        test
               | | | | |  date:        Thu Jan 01 00:00:25 1970 +0000
               | | | | |  summary:     (25) merge one known; far left
               | | | | |
               | o | | |    changeset:   24:a9c19a3d96b7
               | |\ \ \ \   parent:      0:e6eb3150255d
               | | | | | |  parent:      23:a01cddf0766d
               | | | | | |  user:        test
               | | | | | |  date:        Thu Jan 01 00:00:24 1970 +0000
               | | | | | |  summary:     (24) merge one known; immediate right
               | | | | | |
               | o---+ | |  changeset:   23:a01cddf0766d
               | | | | | |  parent:      1:6db2ef61d156
               | | | | | |  parent:      22:e0d9cccacb5d
               | | | | | |  user:        test
               | | | | | |  date:        Thu Jan 01 00:00:23 1970 +0000
               | | | | | |  summary:     (23) merge one known; immediate left
               | | | | | |
               | o-------+  changeset:   22:e0d9cccacb5d
               | | | | | |  parent:      18:1aa84d96232a
               |/ / / / /   parent:      21:d42a756af44d
               | | | | |    user:        test
               | | | | |    date:        Thu Jan 01 00:00:22 1970 +0000
               | | | | |    summary:     (22) merge two known; one far left, one far right
               | | | | |
               | | | | o    changeset:   21:d42a756af44d
               | | | | |\   parent:      19:31ddc2c1573b
               | | | | | |  parent:      20:d30ed6450e32
               | | | | | |  user:        test
               | | | | | |  date:        Thu Jan 01 00:00:21 1970 +0000
               | | | | | |  summary:     (21) expand
               | | | | | |
               +-+-------o  changeset:   20:d30ed6450e32
               | | | | |    parent:      0:e6eb3150255d
               | | | | |    parent:      18:1aa84d96232a
               | | | | |    user:        test
               | | | | |    date:        Thu Jan 01 00:00:20 1970 +0000
               | | | | |    summary:     (20) merge two known; two far right
               | | | | |
               | | | | o    changeset:   19:31ddc2c1573b
               | | | | |\   parent:      15:1dda3f72782d
               | | | | | |  parent:      17:44765d7c06e0
               | | | | | |  user:        test
               | | | | | |  date:        Thu Jan 01 00:00:19 1970 +0000
               | | | | | |  summary:     (19) expand
               | | | | | |
               o---+---+ |  changeset:   18:1aa84d96232a
                 | | | | |  parent:      1:6db2ef61d156
                / / / / /   parent:      15:1dda3f72782d
               | | | | |    user:        test
               | | | | |    date:        Thu Jan 01 00:00:18 1970 +0000
               | | | | |    summary:     (18) merge two known; two far left
               | | | | |
               | | | | o    changeset:   17:44765d7c06e0
               | | | | |\   parent:      12:86b91144a6e9
               | | | | | |  parent:      16:3677d192927d
               | | | | | |  user:        test
               | | | | | |  date:        Thu Jan 01 00:00:17 1970 +0000
               | | | | | |  summary:     (17) expand
               | | | | | |
               +-+-------o  changeset:   16:3677d192927d
               | | | | |    parent:      0:e6eb3150255d
               | | | | |    parent:      1:6db2ef61d156
               | | | | |    user:        test
               | | | | |    date:        Thu Jan 01 00:00:16 1970 +0000
               | | | | |    summary:     (16) merge two known; one immediate right, one near right
               | | | | |
               | | | o |    changeset:   15:1dda3f72782d
               | | | |\ \   parent:      13:22d8966a97e3
               | | | | | |  parent:      14:8eac370358ef
               | | | | | |  user:        test
               | | | | | |  date:        Thu Jan 01 00:00:15 1970 +0000
               | | | | | |  summary:     (15) expand
               | | | | | |
               +-------o |  changeset:   14:8eac370358ef
               | | | | |/   parent:      0:e6eb3150255d
               | | | | |    parent:      12:86b91144a6e9
               | | | | |    user:        test
               | | | | |    date:        Thu Jan 01 00:00:14 1970 +0000
               | | | | |    summary:     (14) merge two known; one immediate right, one far right
               | | | | |
               | | | o |    changeset:   13:22d8966a97e3
               | | | |\ \   parent:      9:7010c0af0a35
               | | | | | |  parent:      11:832d76e6bdf2
               | | | | | |  user:        test
               | | | | | |  date:        Thu Jan 01 00:00:13 1970 +0000
               | | | | | |  summary:     (13) expand
               | | | | | |
               | +---+---o  changeset:   12:86b91144a6e9
               | | | | |    parent:      1:6db2ef61d156
               | | | | |    parent:      9:7010c0af0a35
               | | | | |    user:        test
               | | | | |    date:        Thu Jan 01 00:00:12 1970 +0000
               | | | | |    summary:     (12) merge two known; one immediate right, one far left
               | | | | |
               | | | | o    changeset:   11:832d76e6bdf2
               | | | | |\   parent:      6:b105a072e251
               | | | | | |  parent:      10:74c64d036d72
               | | | | | |  user:        test
               | | | | | |  date:        Thu Jan 01 00:00:11 1970 +0000
               | | | | | |  summary:     (11) expand
               | | | | | |
               +---------o  changeset:   10:74c64d036d72
               | | | | |/   parent:      0:e6eb3150255d
               | | | | |    parent:      6:b105a072e251
               | | | | |    user:        test
               | | | | |    date:        Thu Jan 01 00:00:10 1970 +0000
               | | | | |    summary:     (10) merge two known; one immediate left, one near right
               | | | | |
               | | | o |    changeset:   9:7010c0af0a35
               | | | |\ \   parent:      7:b632bb1b1224
               | | | | | |  parent:      8:7a0b11f71937
               | | | | | |  user:        test
               | | | | | |  date:        Thu Jan 01 00:00:09 1970 +0000
               | | | | | |  summary:     (9) expand
               | | | | | |
               +-------o |  changeset:   8:7a0b11f71937
               | | | |/ /   parent:      0:e6eb3150255d
               | | | | |    parent:      7:b632bb1b1224
               | | | | |    user:        test
               | | | | |    date:        Thu Jan 01 00:00:08 1970 +0000
               | | | | |    summary:     (8) merge two known; one immediate left, one far right
               | | | | |
               | | | o |    changeset:   7:b632bb1b1224
               | | | |\ \   parent:      2:3d9a33b8d1e1
               | | | | | |  parent:      5:4409d547b708
               | | | | | |  user:        test
               | | | | | |  date:        Thu Jan 01 00:00:07 1970 +0000
               | | | | | |  summary:     (7) expand
               | | | | | |
               | | | +---o  changeset:   6:b105a072e251
               | | | | |/   parent:      2:3d9a33b8d1e1
               | | | | |    parent:      5:4409d547b708
               | | | | |    user:        test
               | | | | |    date:        Thu Jan 01 00:00:06 1970 +0000
               | | | | |    summary:     (6) merge two known; one immediate left, one far left
               | | | | |
               | | | o |    changeset:   5:4409d547b708
               | | | |\ \   parent:      3:27eef8ed80b4
               | | | | | |  parent:      4:26a8bac39d9f
               | | | | | |  user:        test
               | | | | | |  date:        Thu Jan 01 00:00:05 1970 +0000
               | | | | | |  summary:     (5) expand
               | | | | | |
               | +---o | |  changeset:   4:26a8bac39d9f
               | | | |/ /   parent:      1:6db2ef61d156
               | | | | |    parent:      3:27eef8ed80b4
               | | | | |    user:        test
               | | | | |    date:        Thu Jan 01 00:00:04 1970 +0000
               | | | | |    summary:     (4) merge two known; one immediate left, one immediate right
               | | | | |
             Empty revision range - display nothing:
               $ hg glog -r 1..0
             From outer space:
               $ cd ..
               $ hg glog -l1 repo
               @  changeset:   34:fea3ac5810e0
               |  tag:         tip
               |  parent:      32:d06dffa21a31
               |  user:        test
               |  date:        Thu Jan 01 00:00:34 1970 +0000
               |  summary:     (34) head
               |
               $ hg glog -l1 repo/a
               @  changeset:   34:fea3ac5810e0
               |  tag:         tip
               |  parent:      32:d06dffa21a31
               |  user:        test
               |  date:        Thu Jan 01 00:00:34 1970 +0000
               |  summary:     (34) head
               |
               $ hg glog -l1 repo/missing
             File log with revs != cset revs:
               $ hg init flog
               $ cd flog
               $ echo one >one
               $ hg add one
               $ hg commit -mone
               $ echo two >two
               $ hg add two
               $ hg commit -mtwo
               $ echo more >two
               $ hg commit -mmore
               $ hg glog two
               @  changeset:   2:12c28321755b
               |  tag:         tip
               |  user:        test
               |  date:        Thu Jan 01 00:00:00 1970 +0000
               |  summary:     more
               |
               o  changeset:   1:5ac72c0599bf
               |  user:        test
               |  date:        Thu Jan 01 00:00:00 1970 +0000
               |  summary:     two
               |
             Issue1896: File log with explicit style
               $ hg glog --style=default one
               o  changeset:   0:3d578b4a1f53
                  user:        test
                  date:        Thu Jan 01 00:00:00 1970 +0000
                  summary:     one
             Issue2395: glog --style header and footer
               $ hg glog --style=xml one
               <?xml version="1.0"?>
               <log>
               o  <logentry revision="0" node="3d578b4a1f537d5fcf7301bfa9c0b97adfaa6fb1">
                  <author email="test">test</author>
                  <date>1970-01-01T00:00:00+00:00</date>
                  <msg xml:space="preserve">one</msg>
                  </logentry>
               </log>
               $ cd ..
             Incoming and outgoing:
               $ hg clone -U -r31 repo repo2
               adding changesets
               adding manifests
               adding file changes
               added 31 changesets with 31 changes to 1 files
               $ cd repo2
               $ hg incoming --graph ../repo
               comparing with ../repo
               searching for changes
               o  changeset:   34:fea3ac5810e0
               |  tag:         tip
               |  parent:      32:d06dffa21a31
               |  user:        test
               |  date:        Thu Jan 01 00:00:34 1970 +0000
               |  summary:     (34) head
               |
               | o  changeset:   33:68608f5145f9
               |    parent:      18:1aa84d96232a
               |    user:        test
               |    date:        Thu Jan 01 00:00:33 1970 +0000
               |    summary:     (33) head
               |
               o  changeset:   32:d06dffa21a31
               |  parent:      27:886ed638191b
               |  parent:      31:621d83e11f67
               |  user:        test
               |  date:        Thu Jan 01 00:00:32 1970 +0000
               |  summary:     (32) expand
               |
               o  changeset:   27:886ed638191b
                  parent:      21:d42a756af44d
                  user:        test
                  date:        Thu Jan 01 00:00:27 1970 +0000
                  summary:     (27) collapse
               $ cd ..
               $ hg -R repo outgoing --graph repo2
               comparing with repo2
               searching for changes
               @  changeset:   34:fea3ac5810e0
               |  tag:         tip
               |  parent:      32:d06dffa21a31
               |  user:        test
               |  date:        Thu Jan 01 00:00:34 1970 +0000
               |  summary:     (34) head
               |
               | o  changeset:   33:68608f5145f9
               |    parent:      18:1aa84d96232a
               |    user:        test
               |    date:        Thu Jan 01 00:00:33 1970 +0000
               |    summary:     (33) head
               |
               o  changeset:   32:d06dffa21a31
               |  parent:      27:886ed638191b
               |  parent:      31:621d83e11f67
               |  user:        test
               |  date:        Thu Jan 01 00:00:32 1970 +0000
               |  summary:     (32) expand
               |
               o  changeset:   27:886ed638191b
                  parent:      21:d42a756af44d
                  user:        test
                  date:        Thu Jan 01 00:00:27 1970 +0000
                  summary:     (27) collapse
             File + limit with revs != cset revs:
               $ cd repo
               $ touch b
               $ hg ci -Aqm0
               $ hg glog -l2 a
               o  changeset:   34:fea3ac5810e0
               |  parent:      32:d06dffa21a31
               |  user:        test
               |  date:        Thu Jan 01 00:00:34 1970 +0000
               |  summary:     (34) head
               |
               | o  changeset:   33:68608f5145f9
               | |  parent:      18:1aa84d96232a
               | |  user:        test
               | |  date:        Thu Jan 01 00:00:33 1970 +0000
               | |  summary:     (33) head
               | |
             File + limit + -ra:b, (b - a) < limit:
               $ hg glog -l3000 -r32:tip a
               o  changeset:   34:fea3ac5810e0
               |  parent:      32:d06dffa21a31
               |  user:        test
               |  date:        Thu Jan 01 00:00:34 1970 +0000
               |  summary:     (34) head
               |
               | o  changeset:   33:68608f5145f9
               | |  parent:      18:1aa84d96232a
               | |  user:        test
               | |  date:        Thu Jan 01 00:00:33 1970 +0000
               | |  summary:     (33) head
               | |
               o |    changeset:   32:d06dffa21a31
               |\ \   parent:      27:886ed638191b
               | | |  parent:      31:621d83e11f67
               | | |  user:        test
               | | |  date:        Thu Jan 01 00:00:32 1970 +0000
               | | |  summary:     (32) expand
               | | |
             Point out a common and an uncommon unshown parent
               $ hg glog -r 'rev(8) or rev(9)'
               o    changeset:   9:7010c0af0a35
               |\   parent:      7:b632bb1b1224
               | |  parent:      8:7a0b11f71937
               | |  user:        test
               | |  date:        Thu Jan 01 00:00:09 1970 +0000
               | |  summary:     (9) expand
               | |
               o |  changeset:   8:7a0b11f71937
               |\|  parent:      0:e6eb3150255d
               | |  parent:      7:b632bb1b1224
               | |  user:        test
               | |  date:        Thu Jan 01 00:00:08 1970 +0000
               | |  summary:     (8) merge two known; one immediate left, one far right
               | |
             File + limit + -ra:b, b < tip:
               $ hg glog -l1 -r32:34 a
               o  changeset:   34:fea3ac5810e0
               |  parent:      32:d06dffa21a31
               |  user:        test
               |  date:        Thu Jan 01 00:00:34 1970 +0000
               |  summary:     (34) head
               |
             file(File) + limit + -ra:b, b < tip:
               $ hg glog -l1 -r32:34 -r 'file("a")'
               o  changeset:   34:fea3ac5810e0
               |  parent:      32:d06dffa21a31
               |  user:        test
               |  date:        Thu Jan 01 00:00:34 1970 +0000
               |  summary:     (34) head
               |
             limit(file(File) and a::b), b < tip:
               $ hg glog -r 'limit(file("a") and 32::34, 1)'
               o    changeset:   32:d06dffa21a31
               |\   parent:      27:886ed638191b
               | |  parent:      31:621d83e11f67
               | |  user:        test
               | |  date:        Thu Jan 01 00:00:32 1970 +0000
               | |  summary:     (32) expand
               | |
             File + limit + -ra:b, b < tip:
               $ hg glog -r 'limit(file("a") and 34::32, 1)'
             File + limit + -ra:b, b < tip, (b - a) < limit:
               $ hg glog -l10 -r33:34 a
               o  changeset:   34:fea3ac5810e0
               |  parent:      32:d06dffa21a31
               |  user:        test
               |  date:        Thu Jan 01 00:00:34 1970 +0000
               |  summary:     (34) head
               |
               | o  changeset:   33:68608f5145f9
               | |  parent:      18:1aa84d96232a
               | |  user:        test
               | |  date:        Thu Jan 01 00:00:33 1970 +0000
               | |  summary:     (33) head
               | |
             Do not crash or produce strange graphs if history is buggy
               $ hg branch branch
               marked working directory as branch branch
               (branches are permanent and global, did you want a bookmark?)
               $ commit 36 "buggy merge: identical parents" 35 35
               $ hg glog -l5
               @  changeset:   36:08a19a744424
               |  branch:      branch
               |  tag:         tip
               |  parent:      35:9159c3644c5e
               |  parent:      35:9159c3644c5e
               |  user:        test
               |  date:        Thu Jan 01 00:00:36 1970 +0000
               |  summary:     (36) buggy merge: identical parents
               |
               o  changeset:   35:9159c3644c5e
               |  user:        test
               |  date:        Thu Jan 01 00:00:00 1970 +0000
               |  summary:     0
               |
               o  changeset:   34:fea3ac5810e0
               |  parent:      32:d06dffa21a31
               |  user:        test
               |  date:        Thu Jan 01 00:00:34 1970 +0000
               |  summary:     (34) head
               |
               | o  changeset:   33:68608f5145f9
               | |  parent:      18:1aa84d96232a
               | |  user:        test
               | |  date:        Thu Jan 01 00:00:33 1970 +0000
               | |  summary:     (33) head
               | |
               o |    changeset:   32:d06dffa21a31
               |\ \   parent:      27:886ed638191b
               | | |  parent:      31:621d83e11f67
               | | |  user:        test
               | | |  date:        Thu Jan 01 00:00:32 1970 +0000
               | | |  summary:     (32) expand
               | | |
             Test log -G options
               $ testlog() {
               >   hg log -G --print-revset "$@"
               >   hg log --template 'nodetag {rev}\n' "$@" | grep nodetag \
               >     | sed 's/.*nodetag/nodetag/' > log.nodes
               >   hg log -G --template 'nodetag {rev}\n' "$@" | grep nodetag \
               >     | sed 's/.*nodetag/nodetag/' > glog.nodes
-              >   diff -u log.nodes glog.nodes
+              >   diff -u log.nodes glog.nodes | grep '^[-+@ ]' || :
               > }
             glog always reorders nodes which explains the difference with log
               $ testlog -r 27 -r 25 -r 21 -r 34 -r 32 -r 31
               ['27', '25', '21', '34', '32', '31']
               []
               --- log.nodes	* (glob)
               +++ glog.nodes	* (glob)
               @@ -1,6 +1,6 @@
               -nodetag 27
               -nodetag 25
               -nodetag 21
                nodetag 34
                nodetag 32
                nodetag 31
               +nodetag 27
               +nodetag 25
               +nodetag 21
-              [1]
               $ testlog -u test -u not-a-user
               []
               (group
                 (group
                   (or
                     (func
                       ('symbol', 'user')
                       ('string', 'test'))
                     (func
                       ('symbol', 'user')
                       ('string', 'not-a-user')))))
               $ testlog -b not-a-branch
               abort: unknown revision 'not-a-branch'!
               abort: unknown revision 'not-a-branch'!
               abort: unknown revision 'not-a-branch'!
               $ testlog -b 35 -b 36 --only-branch branch
               []
               (group
                 (group
                   (or
                     (or
                       (func
                         ('symbol', 'branch')
                         ('string', 'default'))
                       (func
                         ('symbol', 'branch')
                         ('string', 'branch')))
                     (func
                       ('symbol', 'branch')
                       ('string', 'branch')))))
               $ testlog -k expand -k merge
               []
               (group
                 (group
                   (or
                     (func
                       ('symbol', 'keyword')
                       ('string', 'expand'))
                     (func
                       ('symbol', 'keyword')
                       ('string', 'merge')))))
               $ testlog --only-merges
               []
               (group
                 (func
                   ('symbol', 'merge')
                   None))
               $ testlog --no-merges
               []
               (group
                 (not
                   (func
                     ('symbol', 'merge')
                     None)))
               $ testlog --date '2 0 to 4 0'
               []
               (group
                 (func
                   ('symbol', 'date')
                   ('string', '2 0 to 4 0')))
               $ hg log -G -d 'brace ) in a date'
               abort: invalid date: 'brace ) in a date'
               [255]
               $ testlog --prune 31 --prune 32
               []
               (group
                 (group
                   (and
                     (not
                       (group
                         (or
                           ('string', '31')
                           (func
                             ('symbol', 'ancestors')
                             ('string', '31')))))
                     (not
                       (group
                         (or
                           ('string', '32')
                           (func
                             ('symbol', 'ancestors')
                             ('string', '32'))))))))
             Dedicated repo for --follow and paths filtering. The g is crafted to
             have 2 filelog topological heads in a linear changeset graph.
               $ cd ..
               $ hg init follow
               $ cd follow
               $ testlog --follow
               []
               []
               $ echo a > a
               $ echo aa > aa
               $ echo f > f
               $ hg ci -Am "add a" a aa f
               $ hg cp a b
               $ hg cp f g
               $ hg ci -m "copy a b"
               $ mkdir dir
               $ hg mv b dir
               $ echo g >> g
               $ echo f >> f
               $ hg ci -m "mv b dir/b"
               $ hg mv a b
               $ hg cp -f f g
               $ echo a > d
               $ hg add d
               $ hg ci -m "mv a b; add d"
               $ hg mv dir/b e
               $ hg ci -m "mv dir/b e"
               $ hg glog --template '({rev}) {desc|firstline}\n'
               @  (4) mv dir/b e
               |
               o  (3) mv a b; add d
               |
               o  (2) mv b dir/b
               |
               o  (1) copy a b
               |
               o  (0) add a
               $ testlog a
               []
               (group
                 (group
                   (func
                     ('symbol', 'filelog')
                     ('string', 'a'))))
               $ testlog a b
               []
               (group
                 (group
                   (or
                     (func
                       ('symbol', 'filelog')
                       ('string', 'a'))
                     (func
                       ('symbol', 'filelog')
                       ('string', 'b')))))
             Test falling back to slow path for non-existing files
               $ testlog a c
               []
               (group
                 (func
                   ('symbol', '_matchfiles')
                   (list
                     (list
                       (list
                         ('string', 'r:')
                         ('string', 'd:relpath'))
                       ('string', 'p:a'))
                     ('string', 'p:c'))))
             Test multiple --include/--exclude/paths
               $ testlog --include a --include e --exclude b --exclude e a e
               []
               (group
                 (func
                   ('symbol', '_matchfiles')
                   (list
                     (list
                       (list
                         (list
                           (list
                             (list
                               (list
                                 ('string', 'r:')
                                 ('string', 'd:relpath'))
                               ('string', 'p:a'))
                             ('string', 'p:e'))
                           ('string', 'i:a'))
                         ('string', 'i:e'))
                       ('string', 'x:b'))
                     ('string', 'x:e'))))
             Test glob expansion of pats
               $ expandglobs=`python -c "import mercurial.util; \
               >   print mercurial.util.expandglobs and 'true' or 'false'"`
               $ if [ $expandglobs = "true" ]; then
               >    testlog 'a*';
               > else
               >    testlog a*;
               > fi;
               []
               (group
                 (group
                   (func
                     ('symbol', 'filelog')
                     ('string', 'aa'))))
             Test --follow on a directory
               $ testlog -f dir
               abort: cannot follow file not in parent revision: "dir"
               abort: cannot follow file not in parent revision: "dir"
               abort: cannot follow file not in parent revision: "dir"
             Test --follow on file not in parent revision
               $ testlog -f a
               abort: cannot follow file not in parent revision: "a"
               abort: cannot follow file not in parent revision: "a"
               abort: cannot follow file not in parent revision: "a"
             Test --follow and patterns
               $ testlog -f 'glob:*'
               abort: can only follow copies/renames for explicit filenames
               abort: can only follow copies/renames for explicit filenames
               abort: can only follow copies/renames for explicit filenames
             Test --follow on a single rename
               $ hg up -q 2
               $ testlog -f a
               []
               (group
                 (group
                   (func
                     ('symbol', 'follow')
                     ('string', 'a'))))
             Test --follow and multiple renames
               $ hg up -q tip
               $ testlog -f e
               []
               (group
                 (group
                   (func
                     ('symbol', 'follow')
                     ('string', 'e'))))
             Test --follow and multiple filelog heads
               $ hg up -q 2
               $ testlog -f g
               []
               (group
                 (group
                   (func
                     ('symbol', 'follow')
                     ('string', 'g'))))
               $ cat log.nodes
               nodetag 2
               nodetag 1
               nodetag 0
               $ hg up -q tip
               $ testlog -f g
               []
               (group
                 (group
                   (func
                     ('symbol', 'follow')
                     ('string', 'g'))))
               $ cat log.nodes
               nodetag 3
               nodetag 2
               nodetag 0
             Test --follow and multiple files
               $ testlog -f g e
               []
               (group
                 (group
                   (or
                     (func
                       ('symbol', 'follow')
                       ('string', 'g'))
                     (func
                       ('symbol', 'follow')
                       ('string', 'e')))))
               $ cat log.nodes
               nodetag 4
               nodetag 3
               nodetag 2
               nodetag 1
               nodetag 0
             Test --follow-first
               $ hg up -q 3
               $ echo ee > e
               $ hg ci -Am "add another e" e
               created new head
               $ hg merge --tool internal:other 4
 files updated, 1 files merged, 1 files removed, 0 files unresolved
               (branch merge, don't forget to commit)
               $ echo merge > e
               $ hg ci -m "merge 5 and 4"
               $ testlog --follow-first
               []
               (group
                 (func
                   ('symbol', '_firstancestors')
                   ('symbol', '6')))
             Cannot compare with log --follow-first FILE as it never worked
               $ hg log -G --print-revset --follow-first e
               []
               (group
                 (group
                   (func
                     ('symbol', '_followfirst')
                     ('string', 'e'))))
               $ hg log -G --follow-first e --template '{rev} {desc|firstline}\n'
               @    6 merge 5 and 4
               |\
               o |  5 add another e
               | |
             Test --copies
               $ hg log -G --copies --template "{rev} {desc|firstline} \
               >   copies: {file_copies_switch}\n"
               @    6 merge 5 and 4   copies:
               |\
               | o  5 add another e   copies:
               | |
               o |  4 mv dir/b e   copies: e (dir/b)
               |/
               o  3 mv a b; add d   copies: b (a)g (f)
               |
               o  2 mv b dir/b   copies: dir/b (b)
               |
               o  1 copy a b   copies: b (a)g (f)
               |
               o  0 add a   copies:
             Test "set:..." and parent revision
               $ hg up -q 4
               $ testlog "set:copied()"
               []
               (group
                 (func
                   ('symbol', '_matchfiles')
                   (list
                     (list
                       ('string', 'r:')
                       ('string', 'd:relpath'))
                     ('string', 'p:set:copied()'))))
               $ testlog --include "set:copied()"
               []
               (group
                 (func
                   ('symbol', '_matchfiles')
                   (list
                     (list
                       ('string', 'r:')
                       ('string', 'd:relpath'))
                     ('string', 'i:set:copied()'))))
               $ testlog -r "sort(file('set:copied()'), -rev)"
               ["sort(file('set:copied()'), -rev)"]
               []
             Test --removed
               $ testlog --removed
               []
               []
               $ testlog --removed a
               []
               (group
                 (func
                   ('symbol', '_matchfiles')
                   (list
                     (list
                       ('string', 'r:')
                       ('string', 'd:relpath'))
                     ('string', 'p:a'))))
               $ testlog --removed --follow a
               abort: can only follow copies/renames for explicit filenames
               abort: can only follow copies/renames for explicit filenames
               abort: can only follow copies/renames for explicit filenames
             Test --patch and --stat with --follow and --follow-first
               $ hg up -q 3
               $ hg log -G --git --patch b
               o  changeset:   1:216d4c92cf98
               |  user:        test
               |  date:        Thu Jan 01 00:00:00 1970 +0000
               |  summary:     copy a b
               |
               |  diff --git a/a b/b
               |  copy from a
               |  copy to b
               |
               $ hg log -G --git --stat b
               o  changeset:   1:216d4c92cf98
               |  user:        test
               |  date:        Thu Jan 01 00:00:00 1970 +0000
               |  summary:     copy a b
               |
               |   a |  0
               |   1 files changed, 0 insertions(+), 0 deletions(-)
               |
               $ hg log -G --git --patch --follow b
               o  changeset:   1:216d4c92cf98
               |  user:        test
               |  date:        Thu Jan 01 00:00:00 1970 +0000
               |  summary:     copy a b
               |
               |  diff --git a/a b/b
               |  copy from a
               |  copy to b
               |
               o  changeset:   0:f8035bb17114
                  user:        test
                  date:        Thu Jan 01 00:00:00 1970 +0000
                  summary:     add a
                  diff --git a/a b/a
                  new file mode 100644
                  --- /dev/null
                  +++ b/a
                  @@ -0,0 +1,1 @@
                  +a
               $ hg log -G --git --stat --follow b
               o  changeset:   1:216d4c92cf98
               |  user:        test
               |  date:        Thu Jan 01 00:00:00 1970 +0000
               |  summary:     copy a b
               |
               |   a |  0
               |   1 files changed, 0 insertions(+), 0 deletions(-)
               |
               o  changeset:   0:f8035bb17114
                  user:        test
                  date:        Thu Jan 01 00:00:00 1970 +0000
                  summary:     add a
                   a |  1 +
 files changed, 1 insertions(+), 0 deletions(-)
               $ hg up -q 6
               $ hg log -G --git --patch --follow-first e
               @    changeset:   6:fc281d8ff18d
               |\   tag:         tip
               | |  parent:      5:99b31f1c2782
               | |  parent:      4:17d952250a9d
               | |  user:        test
               | |  date:        Thu Jan 01 00:00:00 1970 +0000
               | |  summary:     merge 5 and 4
               | |
               | |  diff --git a/e b/e
               | |  --- a/e
               | |  +++ b/e
               | |  @@ -1,1 +1,1 @@
               | |  -ee
               | |  +merge
               | |
               o |  changeset:   5:99b31f1c2782
               | |  parent:      3:5918b8d165d1
               | |  user:        test
               | |  date:        Thu Jan 01 00:00:00 1970 +0000
               | |  summary:     add another e
               | |
               | |  diff --git a/e b/e
               | |  new file mode 100644
               | |  --- /dev/null
               | |  +++ b/e
               | |  @@ -0,0 +1,1 @@
               | |  +ee
               | |
             Test old-style --rev
               $ hg tag 'foo-bar'
               $ testlog -r 'foo-bar'
               ['foo-bar']
               []
             Test --follow and forward --rev
               $ hg up -q 6
               $ echo g > g
               $ hg ci -Am 'add g' g
               created new head
               $ hg up -q 2
               $ hg log -G --template "{rev} {desc|firstline}\n"
               o  8 add g
               |
               | o  7 Added tag foo-bar for changeset fc281d8ff18d
               |/
               o    6 merge 5 and 4
               |\
               | o  5 add another e
               | |
               o |  4 mv dir/b e
               |/
               o  3 mv a b; add d
               |
               @  2 mv b dir/b
               |
               o  1 copy a b
               |
               o  0 add a
               $ testlog --follow -r6 -r8 -r5 -r7 -r4
               ['6', '8', '5', '7', '4']
               (group
                 (func
                   ('symbol', 'descendants')
                   ('symbol', '6')))
               --- log.nodes	* (glob)
               +++ glog.nodes	* (glob)
               @@ -1,3 +1,3 @@
               -nodetag 6
                nodetag 8
                nodetag 7
               +nodetag 6
-              [1]
             Test --follow-first and forward --rev
               $ testlog --follow-first -r6 -r8 -r5 -r7 -r4
               ['6', '8', '5', '7', '4']
               (group
                 (func
                   ('symbol', '_firstdescendants')
                   ('symbol', '6')))
               --- log.nodes	* (glob)
               +++ glog.nodes	* (glob)
               @@ -1,3 +1,3 @@
               -nodetag 6
                nodetag 8
                nodetag 7
               +nodetag 6
-              [1]
             Test --follow and backward --rev
               $ testlog --follow -r6 -r5 -r7 -r8 -r4
               ['6', '5', '7', '8', '4']
               (group
                 (func
                   ('symbol', 'ancestors')
                   ('symbol', '6')))
             Test --follow-first and backward --rev
               $ testlog --follow-first -r6 -r5 -r7 -r8 -r4
               ['6', '5', '7', '8', '4']
               (group
                 (func
                   ('symbol', '_firstancestors')
                   ('symbol', '6')))
             Test subdir
               $ hg up -q 3
               $ cd dir
               $ testlog .
               []
               (group
                 (func
                   ('symbol', '_matchfiles')
                   (list
                     (list
                       ('string', 'r:')
                       ('string', 'd:relpath'))
                     ('string', 'p:.'))))
               $ testlog ../b
               []
               (group
                 (group
                   (func
                     ('symbol', 'filelog')
                     ('string', '../b'))))
               $ testlog -f ../b
               []
               (group
                 (group
                   (func
                     ('symbol', 'follow')
                     ('string', 'b'))))
               $ cd ..
             Test --hidden
               $ cat > $HGTMP/testhidden.py << EOF
               > def reposetup(ui, repo):
               >     for line in repo.opener('hidden'):
               >         ctx = repo[line.strip()]
               >         repo.changelog.hiddenrevs.add(ctx.rev())
               > EOF
               $ echo '[extensions]' >> .hg/hgrc
               $ echo "hidden=$HGTMP/testhidden.py" >> .hg/hgrc
               $ hg id --debug -i -r 0 > .hg/hidden
               $ testlog
               []
               []
               $ testlog --hidden
               []
               []