This is an archive of the discontinued Mercurial Phabricator instance.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	27359		May 3 2021, 7:49 AM	★	★
Diff 2	27497		May 3 2021, 9:43 PM	★	★
Diff 3	27828	rHG89e11a6da7858eaab397d224d61fbb01e7d303f7	May 3 2021, 6:23 AM	★	★

Commit	Parents	Author	Summary	Date
9114247df898	0346be7f6701	Pierre-Yves David		May 3 2021, 6:23 AM

Status	Author	Revision
Closed	marmoute	D10667 changelogv2: use a dedicated on disk format for changelogv2
Closed	marmoute	D10666 revlog: do not call Rust code if the index is not compatible with it
Closed	marmoute	D10665 revlog: signal which revlog index are compatible with Rust
Closed	marmoute	D10664 revlog: pass around the `rev` we deal with when packing/unpacking entry
Closed	marmoute	D10663 changelogv2: use a dedicated version number
Closed	marmoute	D10662 changelogv2: `copies-side-data` now implies `changelogv2`
Closed	marmoute	D10661 changelogv2: allow upgrade from and to this format
Closed	marmoute	D10660 changelogv2: introduce a "changelogv2" feature
Closed	marmoute	D10659 revlogv2: drop the code related to inlined revlogv2
Closed	marmoute	D10658 revlogv2: no longer attempt to use inline for new revlog
Closed	marmoute	D10657 sidedata: use the "feature" to detect that sidedata are enabled
Closed	marmoute	D10656 revlog: compress sidedata when doing "post-pull" sidedata update
Closed	marmoute	D10655 revlog: compress sidedata in `_writeentry`
Closed	marmoute	D10654 revlog: apply compression mode while reading sidedata
Closed	marmoute	D10653 revlog: introduce a compression mode for sidedata in the revlog index
Closed	marmoute	D10652 revlog: implement a "default compression" mode
Closed	marmoute	D10651 revlog: add a `_get_decompressor` method
Closed	marmoute	D10650 revlog: introduce a plain compression mode
Closed	marmoute	D10649 revlog: use an intermediate variable for `data` in `_chunk`
Closed	marmoute	D10648 revlogv2: preserve the compression mode on disk
Closed	marmoute	D10647 revlog: use `format_version` to dispatch different version in index_get
Closed	marmoute	D10646 revlog: add a "data compression mode" entry in the index tuple
Closed	marmoute	D10645 revlog: fix the `null_item` attribute for V0
Closed	marmoute	D10644 revlog: create a create `null_item` attribute for V0
Closed	marmoute	D10643 revlog: improve documentation of the entry tuple
Closed	marmoute	D10642 revlog: simplify entry update logic in `rewrite_sidedata`
Closed	marmoute	D10641 revlog: simplify the replace_sidedata_info code
Closed	marmoute	D10640 revlog: use `rev` instead of `i` in replace_sidedata_info
Closed	marmoute	D10632 revlogv2: also keep track for the size of the "data" file
Closed	marmoute	D10631 revlogv2: track pending write in the docket and expose it to hooks
Closed	marmoute	D10630 revlog: move the `trypending` logic from the `changelog` to the `revlog`
Closed	marmoute	D10629 revlogv2: delay the update of the changelog docket to transaction end
Closed	marmoute	D10628 revlogv2: track current index size in the docket
Closed	marmoute	D10627 revlogv2: also test transactionality of revlog v2
Closed	marmoute	D10626 revlog: add a new test file focussed on testing transactionally issue
Closed	marmoute	D10625 revlogv2: store version information in the docket only
Closed	marmoute	D10624 revlogv2: introduce a very basic docket file
Closed	marmoute	D10623 revlogv2: mark revlogv2 as requires a full upgrade
Closed	marmoute	D10622 revlog: unify flag processing when loading index
Closed	marmoute	D10621 revlog: unify checks for supported flag
Closed	marmoute	D10620 side-data: drop the associated config and requirements
Closed	marmoute	D10619 revlog: fix capitalisation of an error
Closed	marmoute	D10618 test: no longer directly use the sidedata config and requirements
Closed	marmoute	D10617 sidedata: add a 'side-data' repository feature and use it
Closed	marmoute	D10616 statichttp: add the missing `features` attribute
Closed	marmoute	D10615 sidedata: use revlogv2 requirement in the test helper
Closed	marmoute	D10614 upgrade: display sidedata before upgrade
Closed	marmoute	D10613 revlog: determine sidedata support based on the revlog version
Closed	marmoute	D10612 requirements: no longer drop `generaldelta` requirement with revlogv2
Closed	marmoute	D10611 config: drop the `format.exp-revlogv2.2` option
Closed	marmoute	D10610 revlog: only use the `_indexfp` method for read operation
Closed	marmoute	D10609 revlog: use `_writing` in `rewrite_sidedata`
Closed	marmoute	D10608 revlog: open files in 'r+' instead of 'a+'
Closed	marmoute	D10607 revlog: pass a transaction object to `rewrite_sidedata`
Closed	marmoute	D10606 revlog: rename variable in `rewrite_sidedata` to match other code
Closed	marmoute	D10605 revlog: introduce a mandatory `_writing` context to update revlog content
Closed	marmoute	D10604 revlog: preindent some code in _enforceinlinesize
Closed	marmoute	D10603 revlog: preindent some code in addgroup
Closed	marmoute	D10602 revlog: rename `indexdata` to entry_data
Closed	marmoute	D10601 revlog: use "entry_point" phrasing for loading the revlog
Closed	marmoute	D10600 revlog: directly use self._format_flags when loading index
Closed	marmoute	D10599 revlog: directly use self._format_version when loading index
Closed	marmoute	D10598 revlog: use `_format_flags` to access flags instead of `header`
Closed	marmoute	D10597 revlog: rename `newversionflags` to `new_header`
Closed	marmoute	D10596 revlog: rename `versionflags` to header
Closed	marmoute	D10595 revlog: move index reading logic in a dedicated method
Closed	marmoute	D10594 revlog: define the actual index and datafile at loading time
Closed	marmoute	D10593 revlog: simplify a conditionnal in _enforceinlinesize
Closed	marmoute	D10592 revlog: drop `flush` parameter from `_peek_iscensored`
Closed	marmoute	D10591 revlog: fix error message when data are missing
Closed	marmoute	D10590 revlog: rename `nodemap_file` to `_nodemap_file`
Closed	marmoute	D10589 revlog: use revlog.display_id in error related to bad revisions
Closed	marmoute	D10588 revlog: use revlog.display_id in "revision too big" errors
Closed	marmoute	D10587 revlog: use revlog.display_id in censor related errors
Closed	marmoute	D10586 revlog: use revlog.display_id in integrity error
Closed	marmoute	D10585 revlog: use revlog.display_id in ambiguity errors
Closed	marmoute	D10584 revlog: use revlog.display_id for corruption error
Closed	marmoute	D10583 revlog: use revlog.display_id in format related errors
Closed	marmoute	D10582 revlog: use revlog.display_id in narrow error message
Closed	marmoute	D10581 revlog: use revlog.display_id in LookupError
Closed	marmoute	D10580 revlog: use revlog.display_id for FilteredLookupError
Closed	marmoute	D10579 revlog: introduce a `display_id` property
Closed	marmoute	D10578 revlog: also use radix when computing nodemap data file
Closed	marmoute	D10577 revlog: stop usage of `_indexfile` to computing nodemap path
Closed	marmoute	D10576 revlog: use a "radix" to address revlog
Closed	marmoute	D10575 revlog: rename `datafile` to `datafile`
Closed	marmoute	D10574 revlog: rename `indexfile` to `_indexfile`
Closed	marmoute	D10573 filelog: drop `indexfile` from `filelog`
Closed	marmoute	D10572 manifest: drop the `indexfile` from `manifestrevlog`
Closed	marmoute	D10571 revlog: deal with special "postfix" explicitely
Closed	marmoute	D10570 revlog: split the option initialisation in its own method
Closed	marmoute	D10569 revlog: always "append" full size tuple
Closed	marmoute	D10568 revlog: make the index always return the same tuple
Closed	marmoute	D10567 revlog: introduce an explicit `format_version` member in the index struct
Closed	marmoute	D10566 revlog: rename `hdrsize` to `entry_size` in the C code
Closed	marmoute	D10565 revlog: split the `version` attribute into its two components
Closed	marmoute	D10564 verify: pass a revlog to `_checkrevlog` in `_verifymanifest`
Closed	marmoute	D10563 revlog: replace flag check related to generaldelta with attribute check
Closed	marmoute	D10562 revlog: replace REVLOGV2 check related to sidedata with `hassidedata` checks
Closed	marmoute	D10561 revlog: explicitely pass the "indexfile" parameter
Closed	marmoute	D10544 revlog: highlight current incompatibility in `rewrite_sidedata`
Closed	marmoute	D10543 revlog: adjust rewrite_sidedata code to not delete existing revlog content
Closed	Alphare	D10350 test-copies: test that copies' sidedata can get computed during push
Closed	Alphare	D10349 test-copies: test that copies' sidedata can get computed during pull
Closed	Alphare	D10348 test-copies: test that copies' sidedata does not get corrupted during push
Closed	Alphare	D10347 test-copies: test that copies' sidedata does not get corrupted during pull
Closed	Alphare	D10346 test-copies: simplify some conditional output
Closed	Alphare	D10361 sidedata: move documentation about sidedata helpers to sidedata module
Closed	Alphare	D10360 sidedata: move sidedata-related utils to the dedicated module
Closed	Alphare	D10359 sidedata: replace sidedata upgrade mechanism with the new one
Closed	Alphare	D10358 sidedata: add a way of replacing an existing sidedata computer
Closed	Alphare	D10345 bundle2: remove restriction around sidedata
Closed	Alphare	D10344 sidedata: enable sidedata computers to optionally rewrite flags
Closed	Alphare	D10343 cg4: introduce protocol flag to signify the presence of sidedata
Closed	Alphare	D10342 changegroup: don't limit cgv4 to revlogv2 repos
Closed	Alphare	D10341 sidedata: gate sidedata functionality to revlogv2 in more places
Closed	Alphare	D10340 sidedata: register copies sidedata computer regardless of the revlog version
Closed	Alphare	D10353 revlog: replace the old `revlog_kind` approach with the new `target` one
Closed	Alphare	D10352 revlog: introduce an explicit tracking of what the revlog is about

Diff 27359

mercurial/changegroup.py

	# where this breaks down a bit. That said, I don't			# where this breaks down a bit. That said, I don't
	# know if it would hurt anything.			# know if it would hurt anything.
	for i in pycompat.xrange(rev, 0, -1):			for i in pycompat.xrange(rev, 0, -1):
	if store.linkrev(i) == clrev:			if store.linkrev(i) == clrev:
	return i			return i
	# We failed to resolve a parent for this node, so			# We failed to resolve a parent for this node, so
	# we crash the changegroup construction.			# we crash the changegroup construction.
	if util.safehasattr(store, 'target'):			if util.safehasattr(store, 'target'):
	target = store._indexfile			target = store.display_id
	else:			else:
	# some revlog not actually a revlog			# some revlog not actually a revlog
	target = store._revlog._indexfile			target = store._revlog.display_id

	raise error.Abort(			raise error.Abort(
	b"unable to resolve parent while packing '%s' %r"			b"unable to resolve parent while packing '%s' %r"
	b' for changeset %r' % (target, rev, clrev)			b' for changeset %r' % (target, rev, clrev)
	)			)

	return nullrev			return nullrev

tests/test-narrow-pull.t

	28: Update#2 to f9			28: Update#2 to f9

	Can pull into repo with a single commit			Can pull into repo with a single commit

	$ cd ..			$ cd ..
	$ hg clone -q --narrow ssh://user@dummy/master narrow2 --include "f1" -r 0			$ hg clone -q --narrow ssh://user@dummy/master narrow2 --include "f1" -r 0
	$ cd narrow2			$ cd narrow2
	$ hg pull -q -r 1			$ hg pull -q -r 1
	remote: abort: unexpected error: unable to resolve parent while packing '00manifest.i' 1 for changeset 0			remote: abort: unexpected error: unable to resolve parent while packing '00manifest' 1 for changeset 0
	transaction abort!			transaction abort!
	rollback completed			rollback completed
	abort: pull failed on remote			abort: pull failed on remote
	[100]			[100]

This is an archive of the discontinued Mercurial Phabricator instance.

revlog: use revlog.display_id in narrow error messageClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 27359

mercurial/changegroup.py

tests/test-narrow-pull.t

revlog: use revlog.display_id in narrow error message
ClosedPublic

Revision Contents
Changeset List