upstream/mercurial-mirror Commit - r37447:7d0a29f7

1

2

Function to test discovery between two repos in both directions, using both the local shortcut

2

Function to test discovery between two repos in both directions, using both the local shortcut

3

(which is currently not activated by default) and the full remotable protocol:

3

(which is currently not activated by default) and the full remotable protocol:

4

5

$ testdesc() { # revs_a, revs_b, dagdesc

5

$ testdesc() { # revs_a, revs_b, dagdesc

6

> if [ -d foo ]; then rm -rf foo; fi

6

> if [ -d foo ]; then rm -rf foo; fi

7

> hg init foo

7

> hg init foo

8

> cd foo

8

> cd foo

9

> hg debugbuilddag "$3"

9

> hg debugbuilddag "$3"

10

> hg clone . a $1 --quiet

10

> hg clone . a $1 --quiet

11

> hg clone . b $2 --quiet

11

> hg clone . b $2 --quiet

12

> echo

12

> echo

13

> echo "% -- a -> b tree"

13

> echo "% -- a -> b tree"

14

> hg -R a debugdiscovery b --verbose --old

14

> hg -R a debugdiscovery b --verbose --old

15

> echo

15

> echo

16

> echo "% -- a -> b set"

16

> echo "% -- a -> b set"

17

> hg -R a debugdiscovery b --verbose --debug --config progress.debug=true

17

> hg -R a debugdiscovery b --verbose --debug --config progress.debug=true

18

> echo

18

> echo

19

> echo "% -- a -> b set (tip only)"

19

> echo "% -- a -> b set (tip only)"

20

> hg -R a debugdiscovery b --verbose --debug --config progress.debug=true --rev tip

20

> hg -R a debugdiscovery b --verbose --debug --config progress.debug=true --rev tip

21

> echo

21

> echo

22

> echo "% -- b -> a tree"

22

> echo "% -- b -> a tree"

23

> hg -R b debugdiscovery a --verbose --old

23

> hg -R b debugdiscovery a --verbose --old

24

> echo

24

> echo

25

> echo "% -- b -> a set"

25

> echo "% -- b -> a set"

26

> hg -R b debugdiscovery a --verbose --debug --config progress.debug=true

26

> hg -R b debugdiscovery a --verbose --debug --config progress.debug=true

27

> echo

27

> echo

28

> echo "% -- b -> a set (tip only)"

28

> echo "% -- b -> a set (tip only)"

29

> hg -R b debugdiscovery a --verbose --debug --config progress.debug=true --rev tip

29

> hg -R b debugdiscovery a --verbose --debug --config progress.debug=true --rev tip

30

> cd ..

30

> cd ..

31

> }

31

> }

32

33

34

Small superset:

34

Small superset:

35

36

$ testdesc '-ra1 -ra2' '-rb1 -rb2 -rb3' '

36

$ testdesc '-ra1 -ra2' '-rb1 -rb2 -rb3' '

37

> +2:f +1:a1:b1

37

> +2:f +1:a1:b1

38

> <f +4 :a2

38

> <f +4 :a2

39

> +5 :b2

39

> +5 :b2

40

> <f +3 :b3'

40

> <f +3 :b3'

41

42

% -- a -> b tree

42

% -- a -> b tree

43

comparing with b

43

comparing with b

44

searching for changes

44

searching for changes

45

unpruned common: 01241442b3c2 66f7d451a68b b5714e113bc0

45

unpruned common: 01241442b3c2 66f7d451a68b b5714e113bc0

46

common heads: 01241442b3c2 b5714e113bc0

46

common heads: 01241442b3c2 b5714e113bc0

47

local is subset

47

local is subset

48

49

% -- a -> b set

49

% -- a -> b set

50

comparing with b

50

comparing with b

51

query 1; heads

51

query 1; heads

52

searching for changes

52

searching for changes

53

all local heads known remotely

53

all local heads known remotely

54

common heads: 01241442b3c2 b5714e113bc0

54

common heads: 01241442b3c2 b5714e113bc0

55

local is subset

55

local is subset

56

57

% -- a -> b set (tip only)

57

% -- a -> b set (tip only)

58

comparing with b

58

comparing with b

59

query 1; heads

59

query 1; heads

60

searching for changes

60

searching for changes

61

all local heads known remotely

61

all local heads known remotely

62

common heads: b5714e113bc0

62

common heads: b5714e113bc0

63

64

% -- b -> a tree

64

% -- b -> a tree

65

comparing with a

65

comparing with a

66

searching for changes

66

searching for changes

67

unpruned common: 01241442b3c2 b5714e113bc0

67

unpruned common: 01241442b3c2 b5714e113bc0

68

common heads: 01241442b3c2 b5714e113bc0

68

common heads: 01241442b3c2 b5714e113bc0

69

remote is subset

69

remote is subset

70

71

% -- b -> a set

71

% -- b -> a set

72

comparing with a

72

comparing with a

73

query 1; heads

73

query 1; heads

74

searching for changes

74

searching for changes

75

all remote heads known locally

75

all remote heads known locally

76

common heads: 01241442b3c2 b5714e113bc0

76

common heads: 01241442b3c2 b5714e113bc0

77

remote is subset

77

remote is subset

78

79

% -- b -> a set (tip only)

79

% -- b -> a set (tip only)

80

comparing with a

80

comparing with a

81

query 1; heads

81

query 1; heads

82

searching for changes

82

searching for changes

83

all remote heads known locally

83

all remote heads known locally

84

common heads: 01241442b3c2 b5714e113bc0

84

common heads: 01241442b3c2 b5714e113bc0

85

remote is subset

85

remote is subset

86

87

88

Many new:

88

Many new:

89

90

$ testdesc '-ra1 -ra2' '-rb' '

90

$ testdesc '-ra1 -ra2' '-rb' '

91

> +2:f +3:a1 +3:b

91

> +2:f +3:a1 +3:b

92

> <f +30 :a2'

92

> <f +30 :a2'

93

94

% -- a -> b tree

94

% -- a -> b tree

95

comparing with b

95

comparing with b

96

searching for changes

96

searching for changes

97

unpruned common: bebd167eb94d

97

unpruned common: bebd167eb94d

98

common heads: bebd167eb94d

98

common heads: bebd167eb94d

99

100

% -- a -> b set

100

% -- a -> b set

101

comparing with b

101

comparing with b

102

query 1; heads

102

query 1; heads

103

searching for changes

103

searching for changes

104

taking initial sample

104

taking initial sample

105

searching: 2 queries

105

searching: 2 queries

106

query 2; still undecided: 29, sample size is: 29

106

query 2; still undecided: 29, sample size is: 29

107

2 total queries in *.????s (glob)

107

2 total queries in *.????s (glob)

108

common heads: bebd167eb94d

108

common heads: bebd167eb94d

109

110

% -- a -> b set (tip only)

110

% -- a -> b set (tip only)

111

comparing with b

111

comparing with b

112

query 1; heads

112

query 1; heads

113

searching for changes

113

searching for changes

114

taking quick initial sample

114

taking quick initial sample

115

searching: 2 queries

115

searching: 2 queries

116

query 2; still undecided: 31, sample size is: 31

116

query 2; still undecided: 31, sample size is: 31

117

2 total queries in *.????s (glob)

117

2 total queries in *.????s (glob)

118

common heads: 66f7d451a68b

118

common heads: 66f7d451a68b

119

120

% -- b -> a tree

120

% -- b -> a tree

121

comparing with a

121

comparing with a

122

searching for changes

122

searching for changes

123

unpruned common: 66f7d451a68b bebd167eb94d

123

unpruned common: 66f7d451a68b bebd167eb94d

124

common heads: bebd167eb94d

124

common heads: bebd167eb94d

125

126

% -- b -> a set

126

% -- b -> a set

127

comparing with a

127

comparing with a

128

query 1; heads

128

query 1; heads

129

searching for changes

129

searching for changes

130

taking initial sample

130

taking initial sample

131

searching: 2 queries

131

searching: 2 queries

132

query 2; still undecided: 2, sample size is: 2

132

query 2; still undecided: 2, sample size is: 2

133

2 total queries in *.????s (glob)

133

2 total queries in *.????s (glob)

134

common heads: bebd167eb94d

134

common heads: bebd167eb94d

135

136

% -- b -> a set (tip only)

136

% -- b -> a set (tip only)

137

comparing with a

137

comparing with a

138

query 1; heads

138

query 1; heads

139

searching for changes

139

searching for changes

140

taking initial sample

140

taking initial sample

141

searching: 2 queries

141

searching: 2 queries

142

query 2; still undecided: 2, sample size is: 2

142

query 2; still undecided: 2, sample size is: 2

143

2 total queries in *.????s (glob)

143

2 total queries in *.????s (glob)

144

common heads: bebd167eb94d

144

common heads: bebd167eb94d

145

146

Both sides many new with stub:

146

Both sides many new with stub:

147

148

$ testdesc '-ra1 -ra2' '-rb' '

148

$ testdesc '-ra1 -ra2' '-rb' '

149

> +2:f +2:a1 +30 :b

149

> +2:f +2:a1 +30 :b

150

> <f +30 :a2'

150

> <f +30 :a2'

151

152

% -- a -> b tree

152

% -- a -> b tree

153

comparing with b

153

comparing with b

154

searching for changes

154

searching for changes

155

unpruned common: 2dc09a01254d

155

unpruned common: 2dc09a01254d

156

common heads: 2dc09a01254d

156

common heads: 2dc09a01254d

157

158

% -- a -> b set

158

% -- a -> b set

159

comparing with b

159

comparing with b

160

query 1; heads

160

query 1; heads

161

searching for changes

161

searching for changes

162

taking initial sample

162

taking initial sample

163

searching: 2 queries

163

searching: 2 queries

164

query 2; still undecided: 29, sample size is: 29

164

query 2; still undecided: 29, sample size is: 29

165

2 total queries in *.????s (glob)

165

2 total queries in *.????s (glob)

166

common heads: 2dc09a01254d

166

common heads: 2dc09a01254d

167

168

% -- a -> b set (tip only)

168

% -- a -> b set (tip only)

169

comparing with b

169

comparing with b

170

query 1; heads

170

query 1; heads

171

searching for changes

171

searching for changes

172

taking quick initial sample

172

taking quick initial sample

173

searching: 2 queries

173

searching: 2 queries

174

query 2; still undecided: 31, sample size is: 31

174

query 2; still undecided: 31, sample size is: 31

175

2 total queries in *.????s (glob)

175

2 total queries in *.????s (glob)

176

common heads: 66f7d451a68b

176

common heads: 66f7d451a68b

177

178

% -- b -> a tree

178

% -- b -> a tree

179

comparing with a

179

comparing with a

180

searching for changes

180

searching for changes

181

unpruned common: 2dc09a01254d 66f7d451a68b

181

unpruned common: 2dc09a01254d 66f7d451a68b

182

common heads: 2dc09a01254d

182

common heads: 2dc09a01254d

183

184

% -- b -> a set

184

% -- b -> a set

185

comparing with a

185

comparing with a

186

query 1; heads

186

query 1; heads

187

searching for changes

187

searching for changes

188

taking initial sample

188

taking initial sample

189

searching: 2 queries

189

searching: 2 queries

190

query 2; still undecided: 29, sample size is: 29

190

query 2; still undecided: 29, sample size is: 29

191

2 total queries in *.????s (glob)

191

2 total queries in *.????s (glob)

192

common heads: 2dc09a01254d

192

common heads: 2dc09a01254d

193

194

% -- b -> a set (tip only)

194

% -- b -> a set (tip only)

195

comparing with a

195

comparing with a

196

query 1; heads

196

query 1; heads

197

searching for changes

197

searching for changes

198

taking initial sample

198

taking initial sample

199

searching: 2 queries

199

searching: 2 queries

200

query 2; still undecided: 29, sample size is: 29

200

query 2; still undecided: 29, sample size is: 29

201

2 total queries in *.????s (glob)

201

2 total queries in *.????s (glob)

202

common heads: 2dc09a01254d

202

common heads: 2dc09a01254d

203

204

205

Both many new:

205

Both many new:

206

207

$ testdesc '-ra' '-rb' '

207

$ testdesc '-ra' '-rb' '

208

> +2:f +30 :b

208

> +2:f +30 :b

209

> <f +30 :a'

209

> <f +30 :a'

210

211

% -- a -> b tree

211

% -- a -> b tree

212

comparing with b

212

comparing with b

213

searching for changes

213

searching for changes

214

unpruned common: 66f7d451a68b

214

unpruned common: 66f7d451a68b

215

common heads: 66f7d451a68b

215

common heads: 66f7d451a68b

216

217

% -- a -> b set

217

% -- a -> b set

218

comparing with b

218

comparing with b

219

query 1; heads

219

query 1; heads

220

searching for changes

220

searching for changes

221

taking quick initial sample

221

taking quick initial sample

222

searching: 2 queries

222

searching: 2 queries

223

query 2; still undecided: 31, sample size is: 31

223

query 2; still undecided: 31, sample size is: 31

224

2 total queries in *.????s (glob)

224

2 total queries in *.????s (glob)

225

common heads: 66f7d451a68b

225

common heads: 66f7d451a68b

226

227

% -- a -> b set (tip only)

227

% -- a -> b set (tip only)

228

comparing with b

228

comparing with b

229

query 1; heads

229

query 1; heads

230

searching for changes

230

searching for changes

231

taking quick initial sample

231

taking quick initial sample

232

searching: 2 queries

232

searching: 2 queries

233

query 2; still undecided: 31, sample size is: 31

233

query 2; still undecided: 31, sample size is: 31

234

2 total queries in *.????s (glob)

234

2 total queries in *.????s (glob)

235

common heads: 66f7d451a68b

235

common heads: 66f7d451a68b

236

237

% -- b -> a tree

237

% -- b -> a tree

238

comparing with a

238

comparing with a

239

searching for changes

239

searching for changes

240

unpruned common: 66f7d451a68b

240

unpruned common: 66f7d451a68b

241

common heads: 66f7d451a68b

241

common heads: 66f7d451a68b

242

243

% -- b -> a set

243

% -- b -> a set

244

comparing with a

244

comparing with a

245

query 1; heads

245

query 1; heads

246

searching for changes

246

searching for changes

247

taking quick initial sample

247

taking quick initial sample

248

searching: 2 queries

248

searching: 2 queries

249

query 2; still undecided: 31, sample size is: 31

249

query 2; still undecided: 31, sample size is: 31

250

2 total queries in *.????s (glob)

250

2 total queries in *.????s (glob)

251

common heads: 66f7d451a68b

251

common heads: 66f7d451a68b

252

253

% -- b -> a set (tip only)

253

% -- b -> a set (tip only)

254

comparing with a

254

comparing with a

255

query 1; heads

255

query 1; heads

256

searching for changes

256

searching for changes

257

taking quick initial sample

257

taking quick initial sample

258

searching: 2 queries

258

searching: 2 queries

259

query 2; still undecided: 31, sample size is: 31

259

query 2; still undecided: 31, sample size is: 31

260

2 total queries in *.????s (glob)

260

2 total queries in *.????s (glob)

261

common heads: 66f7d451a68b

261

common heads: 66f7d451a68b

262

263

264

Both many new skewed:

264

Both many new skewed:

265

266

$ testdesc '-ra' '-rb' '

266

$ testdesc '-ra' '-rb' '

267

> +2:f +30 :b

267

> +2:f +30 :b

268

> <f +50 :a'

268

> <f +50 :a'

269

270

% -- a -> b tree

270

% -- a -> b tree

271

comparing with b

271

comparing with b

272

searching for changes

272

searching for changes

273

unpruned common: 66f7d451a68b

273

unpruned common: 66f7d451a68b

274

common heads: 66f7d451a68b

274

common heads: 66f7d451a68b

275

276

% -- a -> b set

276

% -- a -> b set

277

comparing with b

277

comparing with b

278

query 1; heads

278

query 1; heads

279

searching for changes

279

searching for changes

280

taking quick initial sample

280

taking quick initial sample

281

searching: 2 queries

281

searching: 2 queries

282

query 2; still undecided: 51, sample size is: 51

282

query 2; still undecided: 51, sample size is: 51

283

2 total queries in *.????s (glob)

283

2 total queries in *.????s (glob)

284

common heads: 66f7d451a68b

284

common heads: 66f7d451a68b

285

286

% -- a -> b set (tip only)

286

% -- a -> b set (tip only)

287

comparing with b

287

comparing with b

288

query 1; heads

288

query 1; heads

289

searching for changes

289

searching for changes

290

taking quick initial sample

290

taking quick initial sample

291

searching: 2 queries

291

searching: 2 queries

292

query 2; still undecided: 51, sample size is: 51

292

query 2; still undecided: 51, sample size is: 51

293

2 total queries in *.????s (glob)

293

2 total queries in *.????s (glob)

294

common heads: 66f7d451a68b

294

common heads: 66f7d451a68b

295

296

% -- b -> a tree

296

% -- b -> a tree

297

comparing with a

297

comparing with a

298

searching for changes

298

searching for changes

299

unpruned common: 66f7d451a68b

299

unpruned common: 66f7d451a68b

300

common heads: 66f7d451a68b

300

common heads: 66f7d451a68b

301

302

% -- b -> a set

302

% -- b -> a set

303

comparing with a

303

comparing with a

304

query 1; heads

304

query 1; heads

305

searching for changes

305

searching for changes

306

taking quick initial sample

306

taking quick initial sample

307

searching: 2 queries

307

searching: 2 queries

308

query 2; still undecided: 31, sample size is: 31

308

query 2; still undecided: 31, sample size is: 31

309

2 total queries in *.????s (glob)

309

2 total queries in *.????s (glob)

310

common heads: 66f7d451a68b

310

common heads: 66f7d451a68b

311

312

% -- b -> a set (tip only)

312

% -- b -> a set (tip only)

313

comparing with a

313

comparing with a

314

query 1; heads

314

query 1; heads

315

searching for changes

315

searching for changes

316

taking quick initial sample

316

taking quick initial sample

317

searching: 2 queries

317

searching: 2 queries

318

query 2; still undecided: 31, sample size is: 31

318

query 2; still undecided: 31, sample size is: 31

319

2 total queries in *.????s (glob)

319

2 total queries in *.????s (glob)

320

common heads: 66f7d451a68b

320

common heads: 66f7d451a68b

321

322

323

Both many new on top of long history:

323

Both many new on top of long history:

324

325

$ testdesc '-ra' '-rb' '

325

$ testdesc '-ra' '-rb' '

326

> +1000:f +30 :b

326

> +1000:f +30 :b

327

> <f +50 :a'

327

> <f +50 :a'

328

329

% -- a -> b tree

329

% -- a -> b tree

330

comparing with b

330

comparing with b

331

searching for changes

331

searching for changes

332

unpruned common: 7ead0cba2838

332

unpruned common: 7ead0cba2838

333

common heads: 7ead0cba2838

333

common heads: 7ead0cba2838

334

335

% -- a -> b set

335

% -- a -> b set

336

comparing with b

336

comparing with b

337

query 1; heads

337

query 1; heads

338

searching for changes

338

searching for changes

339

taking quick initial sample

339

taking quick initial sample

340

searching: 2 queries

340

searching: 2 queries

341

query 2; still undecided: 1049, sample size is: 11

341

query 2; still undecided: 1049, sample size is: 11

342

sampling from both directions

342

sampling from both directions

343

searching: 3 queries

343

searching: 3 queries

344

query 3; still undecided: 31, sample size is: 31

344

query 3; still undecided: 31, sample size is: 31

345

3 total queries in *.????s (glob)

345

3 total queries in *.????s (glob)

346

common heads: 7ead0cba2838

346

common heads: 7ead0cba2838

347

348

% -- a -> b set (tip only)

348

% -- a -> b set (tip only)

349

comparing with b

349

comparing with b

350

query 1; heads

350

query 1; heads

351

searching for changes

351

searching for changes

352

taking quick initial sample

352

taking quick initial sample

353

searching: 2 queries

353

searching: 2 queries

354

query 2; still undecided: 1049, sample size is: 11

354

query 2; still undecided: 1049, sample size is: 11

355

sampling from both directions

355

sampling from both directions

356

searching: 3 queries

356

searching: 3 queries

357

query 3; still undecided: 31, sample size is: 31

357

query 3; still undecided: 31, sample size is: 31

358

3 total queries in *.????s (glob)

358

3 total queries in *.????s (glob)

359

common heads: 7ead0cba2838

359

common heads: 7ead0cba2838

360

361

% -- b -> a tree

361

% -- b -> a tree

362

comparing with a

362

comparing with a

363

searching for changes

363

searching for changes

364

unpruned common: 7ead0cba2838

364

unpruned common: 7ead0cba2838

365

common heads: 7ead0cba2838

365

common heads: 7ead0cba2838

366

367

% -- b -> a set

367

% -- b -> a set

368

comparing with a

368

comparing with a

369

query 1; heads

369

query 1; heads

370

searching for changes

370

searching for changes

371

taking quick initial sample

371

taking quick initial sample

372

searching: 2 queries

372

searching: 2 queries

373

query 2; still undecided: 1029, sample size is: 11

373

query 2; still undecided: 1029, sample size is: 11

374

sampling from both directions

374

sampling from both directions

375

searching: 3 queries

375

searching: 3 queries

376

query 3; still undecided: 15, sample size is: 15

376

query 3; still undecided: 15, sample size is: 15

377

3 total queries in *.????s (glob)

377

3 total queries in *.????s (glob)

378

common heads: 7ead0cba2838

378

common heads: 7ead0cba2838

379

380

% -- b -> a set (tip only)

380

% -- b -> a set (tip only)

381

comparing with a

381

comparing with a

382

query 1; heads

382

query 1; heads

383

searching for changes

383

searching for changes

384

taking quick initial sample

384

taking quick initial sample

385

searching: 2 queries

385

searching: 2 queries

386

query 2; still undecided: 1029, sample size is: 11

386

query 2; still undecided: 1029, sample size is: 11

387

sampling from both directions

387

sampling from both directions

388

searching: 3 queries

388

searching: 3 queries

389

query 3; still undecided: 15, sample size is: 15

389

query 3; still undecided: 15, sample size is: 15

390

3 total queries in *.????s (glob)

390

3 total queries in *.????s (glob)

391

common heads: 7ead0cba2838

391

common heads: 7ead0cba2838

392

393

394

One with >200 heads, which used to use up all of the sample:

394

One with >200 heads, which used to use up all of the sample:

395

396

$ hg init manyheads

396

$ hg init manyheads

397

$ cd manyheads

397

$ cd manyheads

398

$ echo "+300:r @a" >dagdesc

398

$ echo "+300:r @a" >dagdesc

399

$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads

399

$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads

400

$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads

400

$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads

401

$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads

401

$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads

402

$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads

402

$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads

403

$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads

403

$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads

404

$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads

404

$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads

405

$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads

405

$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads

406

$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads

406

$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads

407

$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads

407

$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads

408

$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads

408

$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads

409

$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads

409

$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads

410

$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads

410

$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads

411

$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads

411

$ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads

412

$ echo "@b *r+3" >>dagdesc # one more head

412

$ echo "@b *r+3" >>dagdesc # one more head

413

$ hg debugbuilddag <dagdesc

413

$ hg debugbuilddag <dagdesc

414

reading DAG from stdin

414

reading DAG from stdin

415

416

$ hg heads -t --template . | wc -c

416

$ hg heads -t --template . | wc -c

417

\s*261 (re)

417

\s*261 (re)

418

419

$ hg clone -b a . a

419

$ hg clone -b a . a

420

adding changesets

420

adding changesets

421

adding manifests

421

adding manifests

422

adding file changes

422

adding file changes

423

added 1340 changesets with 0 changes to 0 files (+259 heads)

423

added 1340 changesets with 0 changes to 0 files (+259 heads)

424

new changesets 1ea73414a91b:1c51e2c80832

424

new changesets 1ea73414a91b:1c51e2c80832

425

updating to branch a

425

updating to branch a

426

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

426

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

427

$ hg clone -b b . b

427

$ hg clone -b b . b

428

adding changesets

428

adding changesets

429

adding manifests

429

adding manifests

430

adding file changes

430

adding file changes

431

added 304 changesets with 0 changes to 0 files

431

added 304 changesets with 0 changes to 0 files

432

new changesets 1ea73414a91b:513314ca8b3a

432

new changesets 1ea73414a91b:513314ca8b3a

433

updating to branch b

433

updating to branch b

434

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

434

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

435

436

$ hg -R a debugdiscovery b --debug --verbose --config progress.debug=true

436

$ hg -R a debugdiscovery b --debug --verbose --config progress.debug=true

437

comparing with b

437

comparing with b

438

query 1; heads

438

query 1; heads

439

searching for changes

439

searching for changes

440

taking quick initial sample

440

taking quick initial sample

441

searching: 2 queries

441

searching: 2 queries

442

query 2; still undecided: 1240, sample size is: 100

442

query 2; still undecided: 1240, sample size is: 100

443

sampling from both directions

443

sampling from both directions

444

searching: 3 queries

444

searching: 3 queries

445

query 3; still undecided: 1140, sample size is: 200

445

query 3; still undecided: 1140, sample size is: 200

446

sampling from both directions

446

sampling from both directions

447

searching: 4 queries

447

searching: 4 queries

448

query 4; still undecided: \d+, sample size is: 200 (re)

448

query 4; still undecided: \d+, sample size is: 200 (re)

449

sampling from both directions

449

sampling from both directions

450

searching: 5 queries

450

searching: 5 queries

451

query 5; still undecided: \d+, sample size is: 200 (re)

451

query 5; still undecided: \d+, sample size is: 200 (re)

452

sampling from both directions

452

sampling from both directions

453

searching: 6 queries

453

searching: 6 queries

454

query 6; still undecided: \d+, sample size is: \d+ (re)

454

query 6; still undecided: \d+, sample size is: \d+ (re)

455

6 total queries in *.????s (glob)

455

6 total queries in *.????s (glob)

456

common heads: 3ee37d65064a

456

common heads: 3ee37d65064a

457

$ hg -R a debugdiscovery b --debug --verbose --config progress.debug=true --rev tip

457

$ hg -R a debugdiscovery b --debug --verbose --config progress.debug=true --rev tip

458

comparing with b

458

comparing with b

459

query 1; heads

459

query 1; heads

460

searching for changes

460

searching for changes

461

taking quick initial sample

461

taking quick initial sample

462

searching: 2 queries

462

searching: 2 queries

463

query 2; still undecided: 303, sample size is: 9

463

query 2; still undecided: 303, sample size is: 9

464

sampling from both directions

464

sampling from both directions

465

searching: 3 queries

465

searching: 3 queries

466

query 3; still undecided: 3, sample size is: 3

466

query 3; still undecided: 3, sample size is: 3

467

3 total queries in *.????s (glob)

467

3 total queries in *.????s (glob)

468

common heads: 3ee37d65064a

468

common heads: 3ee37d65064a

469

470

Test actual protocol when pulling one new head in addition to common heads

470

Test actual protocol when pulling one new head in addition to common heads

471

472

$ hg clone -U b c

472

$ hg clone -U b c

473

$ hg -R c id -ir tip

473

$ hg -R c id -ir tip

474

513314ca8b3a

474

513314ca8b3a

475

$ hg -R c up -qr default

475

$ hg -R c up -qr default

476

$ touch c/f

476

$ touch c/f

477

$ hg -R c ci -Aqm "extra head"

477

$ hg -R c ci -Aqm "extra head"

478

$ hg -R c id -i

478

$ hg -R c id -i

479

e64a39e7da8b

479

e64a39e7da8b

480

481

$ hg serve -R c -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log

481

$ hg serve -R c -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log

482

$ cat hg.pid >> $DAEMON_PIDS

482

$ cat hg.pid >> $DAEMON_PIDS

483

484

$ hg -R b incoming http://localhost:$HGPORT/ -T '{node|short}\n'

484

$ hg -R b incoming http://localhost:$HGPORT/ -T '{node|short}\n'

485

comparing with http://localhost:$HGPORT/

485

comparing with http://localhost:$HGPORT/

486

searching for changes

486

searching for changes

487

e64a39e7da8b

487

e64a39e7da8b

488

489

$ killdaemons.py

489

$ killdaemons.py

490

$ cut -d' ' -f6- access.log | grep -v cmd=known # cmd=known uses random sampling

490

$ cut -d' ' -f6- access.log | grep -v cmd=known # cmd=known uses random sampling

491

"GET /?cmd=capabilities HTTP/1.1" 200 -

491

"GET /?cmd=capabilities HTTP/1.1" 200 -

492

"GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D513314ca8b3ae4dac8eec56966265b00fcf866db x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$

492

"GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D513314ca8b3ae4dac8eec56966265b00fcf866db x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$

493

"GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:$USUAL_BUNDLE_CAPS$&cg=1&common=513314ca8b3ae4dac8eec56966265b00fcf866db&heads=e64a39e7da8b0d54bc63e81169aff001c13b3477 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$

493

"GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:$USUAL_BUNDLE_CAPS$&cg=1&common=513314ca8b3ae4dac8eec56966265b00fcf866db&heads=e64a39e7da8b0d54bc63e81169aff001c13b3477 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$

494

"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$

494

"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$

495

$ cat errors.log

495

$ cat errors.log

496

497

$ cd ..

497

$ cd ..

498

499

500

Issue 4438 - test coverage for 3ef893520a85 issues.

500

Issue 4438 - test coverage for 3ef893520a85 issues.

501

502

$ mkdir issue4438

502

$ mkdir issue4438

503

$ cd issue4438

503

$ cd issue4438

504

#if false

504

#if false

505

generate new bundles:

505

generate new bundles:

506

$ hg init r1

506

$ hg init r1

507

$ for i in `$PYTHON $TESTDIR/seq.py 101`; do hg -R r1 up -qr null && hg -R r1 branch -q b$i && hg -R r1 ci -qmb$i; done

507

$ for i in `$PYTHON $TESTDIR/seq.py 101`; do hg -R r1 up -qr null && hg -R r1 branch -q b$i && hg -R r1 ci -qmb$i; done

508

$ hg clone -q r1 r2

508

$ hg clone -q r1 r2

509

$ for i in `$PYTHON $TESTDIR/seq.py 10`; do hg -R r1 up -qr null && hg -R r1 branch -q c$i && hg -R r1 ci -qmc$i; done

509

$ for i in `$PYTHON $TESTDIR/seq.py 10`; do hg -R r1 up -qr null && hg -R r1 branch -q c$i && hg -R r1 ci -qmc$i; done

510

$ hg -R r2 branch -q r2change && hg -R r2 ci -qmr2change

510

$ hg -R r2 branch -q r2change && hg -R r2 ci -qmr2change

511

$ hg -R r1 bundle -qa $TESTDIR/bundles/issue4438-r1.hg

511

$ hg -R r1 bundle -qa $TESTDIR/bundles/issue4438-r1.hg

512

$ hg -R r2 bundle -qa $TESTDIR/bundles/issue4438-r2.hg

512

$ hg -R r2 bundle -qa $TESTDIR/bundles/issue4438-r2.hg

513

#else

513

#else

514

use existing bundles:

514

use existing bundles:

515

$ hg clone -q $TESTDIR/bundles/issue4438-r1.hg r1

515

$ hg init r1

516

$ hg ~~clone~~ -q $TESTDIR/bundles/issue4438-r2.hg r2

516

$ hg -R r1 -q unbundle $TESTDIR/bundles/issue4438-r1.hg

517

$ hg -R r1 -q up

518

$ hg init r2

519

$ hg -R r2 -q unbundle $TESTDIR/bundles/issue4438-r2.hg

520

$ hg -R r2 -q up

517

#endif

521

#endif

518

522

519

Set iteration order could cause wrong and unstable results - fixed in 73cfaa348650:

523

Set iteration order could cause wrong and unstable results - fixed in 73cfaa348650:

520

524

521

$ hg -R r1 outgoing r2 -T'{rev} '

525

$ hg -R r1 outgoing r2 -T'{rev} '

522

comparing with r2

526

comparing with r2

523

searching for changes

527

searching for changes

524

101 102 103 104 105 106 107 108 109 110 (no-eol)

528

101 102 103 104 105 106 107 108 109 110 (no-eol)

525

529

526

The case where all the 'initialsamplesize' samples already were common would

530

The case where all the 'initialsamplesize' samples already were common would

527

give 'all remote heads known locally' without checking the remaining heads -

531

give 'all remote heads known locally' without checking the remaining heads -

528

fixed in 86c35b7ae300:

532

fixed in 86c35b7ae300:

529

533

530

$ cat >> $TESTTMP/unrandomsample.py << EOF

534

$ cat >> $TESTTMP/unrandomsample.py << EOF

531

> import random

535

> import random

532

> def sample(population, k):

536

> def sample(population, k):

533

> return sorted(population)[:k]

537

> return sorted(population)[:k]

534

> random.sample = sample

538

> random.sample = sample

535

> EOF

539

> EOF

536

540

537

$ cat >> r1/.hg/hgrc << EOF

541

$ cat >> r1/.hg/hgrc << EOF

538

> [extensions]

542

> [extensions]

539

> unrandomsample = $TESTTMP/unrandomsample.py

543

> unrandomsample = $TESTTMP/unrandomsample.py

540

> EOF

544

> EOF

541

545

542

$ hg -R r1 outgoing r2 -T'{rev} ' --config extensions.blackbox=

546

$ hg -R r1 outgoing r2 -T'{rev} ' --config extensions.blackbox=

543

comparing with r2

547

comparing with r2

544

searching for changes

548

searching for changes

545

101 102 103 104 105 106 107 108 109 110 (no-eol)

549

101 102 103 104 105 106 107 108 109 110 (no-eol)

546

$ hg -R r1 --config extensions.blackbox= blackbox

550

$ hg -R r1 --config extensions.blackbox= blackbox

547

* @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> serve --cmdserver chgunix * (glob) (chg !)

551

* @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> serve --cmdserver chgunix * (glob) (chg !)

548

* @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> -R r1 outgoing r2 *-T{rev} * --config *extensions.blackbox=* (glob)

552

* @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> -R r1 outgoing r2 *-T{rev} * --config *extensions.blackbox=* (glob)

549

* @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> found 101 common and 1 unknown server heads, 2 roundtrips in *.????s (glob)

553

* @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> found 101 common and 1 unknown server heads, 2 roundtrips in *.????s (glob)

550

* @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> -R r1 outgoing r2 *-T{rev} * --config *extensions.blackbox=* exited 0 after *.?? seconds (glob)

554

* @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> -R r1 outgoing r2 *-T{rev} * --config *extensions.blackbox=* exited 0 after *.?? seconds (glob)

551

* @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> -R r1 --config *extensions.blackbox=* blackbox (glob)

555

* @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> -R r1 --config *extensions.blackbox=* blackbox (glob)

552

$ cd ..

556

$ cd ..

	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

             Function to test discovery between two repos in both directions, using both the local shortcut
             (which is currently not activated by default) and the full remotable protocol:
               $ testdesc() { # revs_a, revs_b, dagdesc
               >     if [ -d foo ]; then rm -rf foo; fi
               >     hg init foo
               >     cd foo
               >     hg debugbuilddag "$3"
               >     hg clone . a $1 --quiet
               >     hg clone . b $2 --quiet
               >     echo
               >     echo "% -- a -> b tree"
               >     hg -R a debugdiscovery b --verbose --old
               >     echo
               >     echo "% -- a -> b set"
               >     hg -R a debugdiscovery b --verbose --debug --config progress.debug=true
               >     echo
               >     echo "% -- a -> b set (tip only)"
               >     hg -R a debugdiscovery b --verbose --debug --config progress.debug=true --rev tip
               >     echo
               >     echo "% -- b -> a tree"
               >     hg -R b debugdiscovery a --verbose --old
               >     echo
               >     echo "% -- b -> a set"
               >     hg -R b debugdiscovery a --verbose --debug --config progress.debug=true
               >     echo
               >     echo "% -- b -> a set (tip only)"
               >     hg -R b debugdiscovery a --verbose --debug --config progress.debug=true --rev tip
               >     cd ..
               > }
             Small superset:
               $ testdesc '-ra1 -ra2' '-rb1 -rb2 -rb3' '
               > +2:f +1:a1:b1
               > <f +4 :a2
               > +5 :b2
               > <f +3 :b3'
               % -- a -> b tree
               comparing with b
               searching for changes
               unpruned common: 01241442b3c2 66f7d451a68b b5714e113bc0
               common heads: 01241442b3c2 b5714e113bc0
               local is subset
               % -- a -> b set
               comparing with b
               query 1; heads
               searching for changes
               all local heads known remotely
               common heads: 01241442b3c2 b5714e113bc0
               local is subset
               % -- a -> b set (tip only)
               comparing with b
               query 1; heads
               searching for changes
               all local heads known remotely
               common heads: b5714e113bc0
               % -- b -> a tree
               comparing with a
               searching for changes
               unpruned common: 01241442b3c2 b5714e113bc0
               common heads: 01241442b3c2 b5714e113bc0
               remote is subset
               % -- b -> a set
               comparing with a
               query 1; heads
               searching for changes
               all remote heads known locally
               common heads: 01241442b3c2 b5714e113bc0
               remote is subset
               % -- b -> a set (tip only)
               comparing with a
               query 1; heads
               searching for changes
               all remote heads known locally
               common heads: 01241442b3c2 b5714e113bc0
               remote is subset
             Many new:
               $ testdesc '-ra1 -ra2' '-rb' '
               > +2:f +3:a1 +3:b
               > <f +30 :a2'
               % -- a -> b tree
               comparing with b
               searching for changes
               unpruned common: bebd167eb94d
               common heads: bebd167eb94d
               % -- a -> b set
               comparing with b
               query 1; heads
               searching for changes
               taking initial sample
               searching: 2 queries
               query 2; still undecided: 29, sample size is: 29
 total queries in *.????s (glob)
               common heads: bebd167eb94d
               % -- a -> b set (tip only)
               comparing with b
               query 1; heads
               searching for changes
               taking quick initial sample
               searching: 2 queries
               query 2; still undecided: 31, sample size is: 31
 total queries in *.????s (glob)
               common heads: 66f7d451a68b
               % -- b -> a tree
               comparing with a
               searching for changes
               unpruned common: 66f7d451a68b bebd167eb94d
               common heads: bebd167eb94d
               % -- b -> a set
               comparing with a
               query 1; heads
               searching for changes
               taking initial sample
               searching: 2 queries
               query 2; still undecided: 2, sample size is: 2
 total queries in *.????s (glob)
               common heads: bebd167eb94d
               % -- b -> a set (tip only)
               comparing with a
               query 1; heads
               searching for changes
               taking initial sample
               searching: 2 queries
               query 2; still undecided: 2, sample size is: 2
 total queries in *.????s (glob)
               common heads: bebd167eb94d
             Both sides many new with stub:
               $ testdesc '-ra1 -ra2' '-rb' '
               > +2:f +2:a1 +30 :b
               > <f +30 :a2'
               % -- a -> b tree
               comparing with b
               searching for changes
               unpruned common: 2dc09a01254d
               common heads: 2dc09a01254d
               % -- a -> b set
               comparing with b
               query 1; heads
               searching for changes
               taking initial sample
               searching: 2 queries
               query 2; still undecided: 29, sample size is: 29
 total queries in *.????s (glob)
               common heads: 2dc09a01254d
               % -- a -> b set (tip only)
               comparing with b
               query 1; heads
               searching for changes
               taking quick initial sample
               searching: 2 queries
               query 2; still undecided: 31, sample size is: 31
 total queries in *.????s (glob)
               common heads: 66f7d451a68b
               % -- b -> a tree
               comparing with a
               searching for changes
               unpruned common: 2dc09a01254d 66f7d451a68b
               common heads: 2dc09a01254d
               % -- b -> a set
               comparing with a
               query 1; heads
               searching for changes
               taking initial sample
               searching: 2 queries
               query 2; still undecided: 29, sample size is: 29
 total queries in *.????s (glob)
               common heads: 2dc09a01254d
               % -- b -> a set (tip only)
               comparing with a
               query 1; heads
               searching for changes
               taking initial sample
               searching: 2 queries
               query 2; still undecided: 29, sample size is: 29
 total queries in *.????s (glob)
               common heads: 2dc09a01254d
             Both many new:
               $ testdesc '-ra' '-rb' '
               > +2:f +30 :b
               > <f +30 :a'
               % -- a -> b tree
               comparing with b
               searching for changes
               unpruned common: 66f7d451a68b
               common heads: 66f7d451a68b
               % -- a -> b set
               comparing with b
               query 1; heads
               searching for changes
               taking quick initial sample
               searching: 2 queries
               query 2; still undecided: 31, sample size is: 31
 total queries in *.????s (glob)
               common heads: 66f7d451a68b
               % -- a -> b set (tip only)
               comparing with b
               query 1; heads
               searching for changes
               taking quick initial sample
               searching: 2 queries
               query 2; still undecided: 31, sample size is: 31
 total queries in *.????s (glob)
               common heads: 66f7d451a68b
               % -- b -> a tree
               comparing with a
               searching for changes
               unpruned common: 66f7d451a68b
               common heads: 66f7d451a68b
               % -- b -> a set
               comparing with a
               query 1; heads
               searching for changes
               taking quick initial sample
               searching: 2 queries
               query 2; still undecided: 31, sample size is: 31
 total queries in *.????s (glob)
               common heads: 66f7d451a68b
               % -- b -> a set (tip only)
               comparing with a
               query 1; heads
               searching for changes
               taking quick initial sample
               searching: 2 queries
               query 2; still undecided: 31, sample size is: 31
 total queries in *.????s (glob)
               common heads: 66f7d451a68b
             Both many new skewed:
               $ testdesc '-ra' '-rb' '
               > +2:f +30 :b
               > <f +50 :a'
               % -- a -> b tree
               comparing with b
               searching for changes
               unpruned common: 66f7d451a68b
               common heads: 66f7d451a68b
               % -- a -> b set
               comparing with b
               query 1; heads
               searching for changes
               taking quick initial sample
               searching: 2 queries
               query 2; still undecided: 51, sample size is: 51
 total queries in *.????s (glob)
               common heads: 66f7d451a68b
               % -- a -> b set (tip only)
               comparing with b
               query 1; heads
               searching for changes
               taking quick initial sample
               searching: 2 queries
               query 2; still undecided: 51, sample size is: 51
 total queries in *.????s (glob)
               common heads: 66f7d451a68b
               % -- b -> a tree
               comparing with a
               searching for changes
               unpruned common: 66f7d451a68b
               common heads: 66f7d451a68b
               % -- b -> a set
               comparing with a
               query 1; heads
               searching for changes
               taking quick initial sample
               searching: 2 queries
               query 2; still undecided: 31, sample size is: 31
 total queries in *.????s (glob)
               common heads: 66f7d451a68b
               % -- b -> a set (tip only)
               comparing with a
               query 1; heads
               searching for changes
               taking quick initial sample
               searching: 2 queries
               query 2; still undecided: 31, sample size is: 31
 total queries in *.????s (glob)
               common heads: 66f7d451a68b
             Both many new on top of long history:
               $ testdesc '-ra' '-rb' '
               > +1000:f +30 :b
               > <f +50 :a'
               % -- a -> b tree
               comparing with b
               searching for changes
               unpruned common: 7ead0cba2838
               common heads: 7ead0cba2838
               % -- a -> b set
               comparing with b
               query 1; heads
               searching for changes
               taking quick initial sample
               searching: 2 queries
               query 2; still undecided: 1049, sample size is: 11
               sampling from both directions
               searching: 3 queries
               query 3; still undecided: 31, sample size is: 31
 total queries in *.????s (glob)
               common heads: 7ead0cba2838
               % -- a -> b set (tip only)
               comparing with b
               query 1; heads
               searching for changes
               taking quick initial sample
               searching: 2 queries
               query 2; still undecided: 1049, sample size is: 11
               sampling from both directions
               searching: 3 queries
               query 3; still undecided: 31, sample size is: 31
 total queries in *.????s (glob)
               common heads: 7ead0cba2838
               % -- b -> a tree
               comparing with a
               searching for changes
               unpruned common: 7ead0cba2838
               common heads: 7ead0cba2838
               % -- b -> a set
               comparing with a
               query 1; heads
               searching for changes
               taking quick initial sample
               searching: 2 queries
               query 2; still undecided: 1029, sample size is: 11
               sampling from both directions
               searching: 3 queries
               query 3; still undecided: 15, sample size is: 15
 total queries in *.????s (glob)
               common heads: 7ead0cba2838
               % -- b -> a set (tip only)
               comparing with a
               query 1; heads
               searching for changes
               taking quick initial sample
               searching: 2 queries
               query 2; still undecided: 1029, sample size is: 11
               sampling from both directions
               searching: 3 queries
               query 3; still undecided: 15, sample size is: 15
 total queries in *.????s (glob)
               common heads: 7ead0cba2838
             One with >200 heads, which used to use up all of the sample:
               $ hg init manyheads
               $ cd manyheads
               $ echo "+300:r @a" >dagdesc
               $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads
               $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads
               $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads
               $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads
               $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads
               $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads
               $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads
               $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads
               $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads
               $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads
               $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads
               $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads
               $ echo "*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3 *r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3*r+3" >>dagdesc # 20 heads
               $ echo "@b *r+3" >>dagdesc # one more head
               $ hg debugbuilddag <dagdesc
               reading DAG from stdin
               $ hg heads -t --template . | wc -c
               \s*261 (re)
               $ hg clone -b a . a
               adding changesets
               adding manifests
               adding file changes
               added 1340 changesets with 0 changes to 0 files (+259 heads)
               new changesets 1ea73414a91b:1c51e2c80832
               updating to branch a
 files updated, 0 files merged, 0 files removed, 0 files unresolved
               $ hg clone -b b . b
               adding changesets
               adding manifests
               adding file changes
               added 304 changesets with 0 changes to 0 files
               new changesets 1ea73414a91b:513314ca8b3a
               updating to branch b
 files updated, 0 files merged, 0 files removed, 0 files unresolved
               $ hg -R a debugdiscovery b --debug --verbose --config progress.debug=true
               comparing with b
               query 1; heads
               searching for changes
               taking quick initial sample
               searching: 2 queries
               query 2; still undecided: 1240, sample size is: 100
               sampling from both directions
               searching: 3 queries
               query 3; still undecided: 1140, sample size is: 200
               sampling from both directions
               searching: 4 queries
               query 4; still undecided: \d+, sample size is: 200 (re)
               sampling from both directions
               searching: 5 queries
               query 5; still undecided: \d+, sample size is: 200 (re)
               sampling from both directions
               searching: 6 queries
               query 6; still undecided: \d+, sample size is: \d+ (re)
 total queries in *.????s (glob)
               common heads: 3ee37d65064a
               $ hg -R a debugdiscovery b --debug --verbose --config progress.debug=true --rev tip
               comparing with b
               query 1; heads
               searching for changes
               taking quick initial sample
               searching: 2 queries
               query 2; still undecided: 303, sample size is: 9
               sampling from both directions
               searching: 3 queries
               query 3; still undecided: 3, sample size is: 3
 total queries in *.????s (glob)
               common heads: 3ee37d65064a
             Test actual protocol when pulling one new head in addition to common heads
               $ hg clone -U b c
               $ hg -R c id -ir tip
 ca8b3a
               $ hg -R c up -qr default
               $ touch c/f
               $ hg -R c ci -Aqm "extra head"
               $ hg -R c id -i
               e64a39e7da8b
               $ hg serve -R c -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
               $ cat hg.pid >> $DAEMON_PIDS
               $ hg -R b incoming http://localhost:$HGPORT/ -T '{node|short}\n'
               comparing with http://localhost:$HGPORT/
               searching for changes
               e64a39e7da8b
               $ killdaemons.py
               $ cut -d' ' -f6- access.log | grep -v cmd=known # cmd=known uses random sampling
               "GET /?cmd=capabilities HTTP/1.1" 200 -
               "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D513314ca8b3ae4dac8eec56966265b00fcf866db x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
               "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:$USUAL_BUNDLE_CAPS$&cg=1&common=513314ca8b3ae4dac8eec56966265b00fcf866db&heads=e64a39e7da8b0d54bc63e81169aff001c13b3477 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
               "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$
               $ cat errors.log
               $ cd ..
             Issue 4438 - test coverage for 3ef893520a85 issues.
               $ mkdir issue4438
               $ cd issue4438
             #if false
             generate new bundles:
               $ hg init r1
               $ for i in `$PYTHON $TESTDIR/seq.py 101`; do hg -R r1 up -qr null && hg -R r1 branch -q b$i && hg -R r1 ci -qmb$i; done
               $ hg clone -q r1 r2
               $ for i in `$PYTHON $TESTDIR/seq.py 10`; do hg -R r1 up -qr null && hg -R r1 branch -q c$i && hg -R r1 ci -qmc$i; done
               $ hg -R r2 branch -q r2change && hg -R r2 ci -qmr2change
               $ hg -R r1 bundle -qa $TESTDIR/bundles/issue4438-r1.hg
               $ hg -R r2 bundle -qa $TESTDIR/bundles/issue4438-r2.hg
             #else
             use existing bundles:
-              $ hg clone -q $TESTDIR/bundles/issue4438-r1.hg r1
+              $ hg init r1
-              $ hg clone -q $TESTDIR/bundles/issue4438-r2.hg r2
+              $ hg -R r1 -q unbundle $TESTDIR/bundles/issue4438-r1.hg
+              $ hg -R r1 -q up
+              $ hg init r2
+              $ hg -R r2 -q unbundle $TESTDIR/bundles/issue4438-r2.hg
+              $ hg -R r2 -q up
             #endif
             Set iteration order could cause wrong and unstable results - fixed in 73cfaa348650:
               $ hg -R r1 outgoing r2 -T'{rev} '
               comparing with r2
               searching for changes
 102 103 104 105 106 107 108 109 110  (no-eol)
             The case where all the 'initialsamplesize' samples already were common would
             give 'all remote heads known locally' without checking the remaining heads -
             fixed in 86c35b7ae300:
               $ cat >> $TESTTMP/unrandomsample.py << EOF
               > import random
               > def sample(population, k):
               >     return sorted(population)[:k]
               > random.sample = sample
               > EOF
               $ cat >> r1/.hg/hgrc << EOF
               > [extensions]
               > unrandomsample = $TESTTMP/unrandomsample.py
               > EOF
               $ hg -R r1 outgoing r2 -T'{rev} ' --config extensions.blackbox=
               comparing with r2
               searching for changes
 102 103 104 105 106 107 108 109 110  (no-eol)
               $ hg -R r1 --config extensions.blackbox= blackbox
               * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> serve --cmdserver chgunix * (glob) (chg !)
               * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> -R r1 outgoing r2 *-T{rev} * --config *extensions.blackbox=* (glob)
               * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> found 101 common and 1 unknown server heads, 2 roundtrips in *.????s (glob)
               * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> -R r1 outgoing r2 *-T{rev} * --config *extensions.blackbox=* exited 0 after *.?? seconds (glob)
               * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> -R r1 --config *extensions.blackbox=* blackbox (glob)
               $ cd ..