Mon, 31 Jan 2022 18:38:15 +0100 |
Pierre-Yves David |
transaction: do not rely on a global variable to post_finalize file
|
Mon, 31 Jan 2022 08:44:48 +0100 |
Pierre-Yves David |
dirstate: introduce a "tracked-key" feature
|
Mon, 31 Jan 2022 14:26:35 +0100 |
Pierre-Yves David |
dirstate: rename the filegenerator used for writing
|
Mon, 31 Jan 2022 08:23:54 +0100 |
Pierre-Yves David |
dirstate: use a context manager when writing the dirstate
|
Wed, 02 Feb 2022 17:24:05 +0100 |
Raphaël Gomès |
branching: merge stable into default
|
Wed, 02 Feb 2022 17:02:34 +0100 |
Raphaël Gomès |
Added signature for changeset 75676122c2bf
stable
|
Wed, 02 Feb 2022 17:02:09 +0100 |
Raphaël Gomès |
Added tag 6.0.2 for changeset 75676122c2bf
stable
|
Wed, 02 Feb 2022 15:03:29 +0100 |
Raphaël Gomès |
relnotes: add 6.0.1 and 6.0.2 notes
stable 6.0.2
|
Tue, 01 Feb 2022 15:19:50 +0100 |
Pierre-Yves David |
branchmap: stop writing cache for uncommitted data
stable
|
Mon, 31 Jan 2022 19:28:58 +0100 |
Pierre-Yves David |
transaction: add a way to know a transaction has been finalized
stable
|
Tue, 01 Feb 2022 15:14:05 +0100 |
Pierre-Yves David |
branchmap: Add a test about writing branchmap and aborted transaction
stable
|
Tue, 01 Feb 2022 16:36:20 +0100 |
Pierre-Yves David |
dirstate-v2: rename the configuration to enable the format
stable
|
Wed, 26 Jan 2022 15:32:18 -0800 |
Martin von Zweigbergk |
arbitraryfilectx: use our existing helpers for reading and writing files
|
Thu, 11 Feb 2021 22:52:43 -0800 |
Martin von Zweigbergk |
fix: remove unnecessary and overly strict check for divergence
|
Wed, 26 Jan 2022 10:11:01 -0800 |
Martin von Zweigbergk |
encoding: fix trim() to be O(n) instead of O(n^2)
|
Mon, 24 Jan 2022 11:49:06 +0100 |
Pierre-Yves David |
stream-clone: filter possible missing requirements using all supported one
stable
|
Tue, 11 Jan 2022 21:40:08 +0100 |
Pierre-Yves David |
share-safe: enable by default (BC)
|
Tue, 11 Jan 2022 09:56:03 +0100 |
Pierre-Yves David |
share-safe: add support for static-http repository
|
Tue, 11 Jan 2022 09:36:10 +0100 |
Pierre-Yves David |
legacy-revlog: fix requirement computation when cloning legacy repo
|
Mon, 10 Jan 2022 12:48:35 +0100 |
Pierre-Yves David |
requirements: do not warn about dropping share-safe, unless explicitly set
|
Tue, 11 Jan 2022 06:40:44 +0100 |
Pierre-Yves David |
sparse: take lock before writing requirements
|
Fri, 07 Jan 2022 16:30:11 +0100 |
Pierre-Yves David |
largefiles: take lock before writing requirements
|
Fri, 07 Jan 2022 17:33:27 +0100 |
Pierre-Yves David |
lfs: take lock before writing requirements
|
Tue, 11 Jan 2022 06:32:18 +0100 |
Pierre-Yves David |
test: simpler requirements matching in test-repo-compengines.t
|
Mon, 10 Jan 2022 19:52:07 +0100 |
Pierre-Yves David |
test: simpler requirements matching in test-lfs-largefiles.t
|
Mon, 10 Jan 2022 12:06:42 +0100 |
Pierre-Yves David |
test: simpler requirements matching in test-sidedata.t
|
Mon, 10 Jan 2022 11:58:33 +0100 |
Pierre-Yves David |
test: simpler requirement matching in test-revlog-v2.t
|
Mon, 10 Jan 2022 19:46:54 +0100 |
Pierre-Yves David |
test-copies: narrow the format check in test-copies-in-changeset.t
|
Fri, 07 Jan 2022 17:32:25 +0100 |
Pierre-Yves David |
tests: use debugrequires instead of grepping the file directly
|
Tue, 11 Jan 2022 16:32:38 +0100 |
Pierre-Yves David |
tests: use debugrequires in test-upgrade-repo.t
|
Thu, 06 Jan 2022 17:15:49 +0100 |
Pierre-Yves David |
test: do not use `which` to find an exec path in the test
|
Fri, 14 Jan 2022 18:17:55 +0100 |
Pierre-Yves David |
stream-clone: stop considering working copy only requirements
|
Tue, 18 Jan 2022 00:19:04 +0100 |
Pierre-Yves David |
stream-clone: also filter the requirement we put in the bundle 2
|
Mon, 24 Jan 2022 12:44:20 +0100 |
Pierre-Yves David |
requirements: add an official `REVLOG_COMPRESSION_ZSTD` const
|
Tue, 18 Jan 2022 20:35:04 +0100 |
Pierre-Yves David |
stream-requirements: smoother matching in test-http-protocol.t
|
Tue, 18 Jan 2022 12:21:13 +0100 |
Pierre-Yves David |
stream-requirements: smoother matching in test-ssh-bundle1.t
|
Tue, 18 Jan 2022 12:02:50 +0100 |
Pierre-Yves David |
stream-requirements: smoother matching in test-ssh-proto.t
|
Tue, 18 Jan 2022 10:50:20 +0100 |
Pierre-Yves David |
stream-requirements: smoother matching in test-hgweb-commands.t
|
Tue, 18 Jan 2022 10:50:08 +0100 |
Pierre-Yves David |
stream-requirements: smoother matching in test-treemanifest.t
|
Tue, 18 Jan 2022 10:49:43 +0100 |
Pierre-Yves David |
stream-requirements: smoother matching in test-ssh-proto-unbundle.t
|
Mon, 24 Jan 2022 12:58:18 +0100 |
Pierre-Yves David |
test-bundle: split some variant in there own section
|
Tue, 18 Jan 2022 15:27:51 +0100 |
Pierre-Yves David |
test-bundle: split each variant in there own section
|
Mon, 24 Jan 2022 01:28:16 +0100 |
Pierre-Yves David |
test-http-bad-server: abstract the `streamreqs` value
|
Fri, 21 Jan 2022 19:57:47 +0100 |
Pierre-Yves David |
test-http-bad-server: use the new pattern-reading for a test-case
|
Fri, 21 Jan 2022 19:25:57 +0100 |
Pierre-Yves David |
test-http-bad-server: use the new pattern-reading for a test-case
|
Fri, 21 Jan 2022 19:19:05 +0100 |
Pierre-Yves David |
test-http-bad-server: use the new pattern-reading for a test-case
|
Fri, 21 Jan 2022 19:04:10 +0100 |
Pierre-Yves David |
test-http-bad-server: use the new pattern-reading for a test-case
|
Sun, 23 Jan 2022 19:51:00 +0100 |
Pierre-Yves David |
test-http-bad-server: use the new pattern-reading for a test-case
|
Sun, 23 Jan 2022 19:49:42 +0100 |
Pierre-Yves David |
test-http-bad-server: introduce socket closing after reading a pattern
|
Fri, 21 Jan 2022 18:22:13 +0100 |
Pierre-Yves David |
test-http-bad-server: move on test from bytes-count to pattern
|
Fri, 21 Jan 2022 18:01:59 +0100 |
Pierre-Yves David |
test-http-bad-server: move on test from bytes-count to pattern
|
Fri, 21 Jan 2022 17:54:31 +0100 |
Pierre-Yves David |
test-http-bad-server: move on test from bytes-count to pattern
|
Fri, 21 Jan 2022 17:53:06 +0100 |
Pierre-Yves David |
test-http-bad-server: move on test from bytes-count to pattern
|
Fri, 21 Jan 2022 17:49:59 +0100 |
Pierre-Yves David |
test-http-bad-server: move on test from bytes-count to pattern
|
Fri, 21 Jan 2022 17:40:02 +0100 |
Pierre-Yves David |
test-http-bad-server: move on test from bytes-count to pattern
|
Fri, 21 Jan 2022 17:06:01 +0100 |
Pierre-Yves David |
test-http-bad-server: move on test from bytes-count to pattern
|
Fri, 21 Jan 2022 17:00:58 +0100 |
Pierre-Yves David |
test-http-bad-server: move on test from bytes-count to pattern
|
Fri, 21 Jan 2022 16:27:13 +0100 |
Pierre-Yves David |
test-http-bad-server: move on test from bytes-count to pattern
|
Fri, 21 Jan 2022 16:23:44 +0100 |
Pierre-Yves David |
test-http-bad-server: move on test from bytes-count to pattern
|
Fri, 21 Jan 2022 16:22:10 +0100 |
Pierre-Yves David |
test-http-bad-server: move on test from bytes-count to pattern
|
Sat, 22 Jan 2022 08:55:59 +0100 |
Pierre-Yves David |
test-http-bad-server: move on test from bytes-count to pattern
|
Fri, 21 Jan 2022 16:07:04 +0100 |
Pierre-Yves David |
test-http-bad-server: move on test from bytes-count to pattern
|
Sun, 23 Jan 2022 20:24:35 +0100 |
Pierre-Yves David |
test-http-bad-server: modify some `tail` call fit their goal
|
Fri, 21 Jan 2022 16:02:47 +0100 |
Pierre-Yves David |
test-http-bad-server: move on test from bytes-count to pattern
|
Fri, 21 Jan 2022 16:02:26 +0100 |
Pierre-Yves David |
test-http-bad-server: move on test from bytes-count to pattern
|
Fri, 21 Jan 2022 15:52:48 +0100 |
Pierre-Yves David |
test-http-bad-server: move on test from bytes-count to pattern
|
Fri, 21 Jan 2022 15:44:15 +0100 |
Pierre-Yves David |
test-http-bad-server: move on test from bytes-count to pattern
|
Sat, 22 Jan 2022 01:51:28 +0100 |
Pierre-Yves David |
test-bad-http-server: introduce sock closing when writing a pattern
|
Sat, 22 Jan 2022 01:13:12 +0100 |
Pierre-Yves David |
test-http-bad-server: document that the value are actually a list
|
Fri, 21 Jan 2022 12:44:39 +0100 |
Pierre-Yves David |
test-http-bad-server: refactor the writing logic to avoid early return
|
Fri, 21 Jan 2022 11:58:55 +0100 |
Pierre-Yves David |
test-http-bad-server: replace the default 65537 value in output
|
Fri, 21 Jan 2022 11:15:56 +0100 |
Pierre-Yves David |
test-http-bad-server: refactor the reading logic to avoid early return
|
Fri, 21 Jan 2022 03:05:43 +0100 |
Pierre-Yves David |
test-http-bad-server: factor code dealing with "read" in the new object
|
Fri, 21 Jan 2022 00:54:15 +0100 |
Pierre-Yves David |
test-http-bad-server: factor code dealing with "write" in the new object
|
Sun, 23 Jan 2022 21:25:01 +0100 |
Pierre-Yves David |
test-http-bad-server: unify log printing for `sendall` and `write`
|
Fri, 21 Jan 2022 01:07:50 +0100 |
Pierre-Yves David |
test-http-bad-server: track close condition in an object
|
Wed, 19 Jan 2022 19:14:17 +0100 |
Pierre-Yves David |
test-http-bad-server: use more readable name for variable
|
Fri, 21 Jan 2022 02:07:13 +0100 |
Pierre-Yves David |
test-http-bad-server: align output by using `;`
|
Wed, 19 Jan 2022 19:04:55 +0100 |
Pierre-Yves David |
test-http-bad-server: highlight each test with section
|
Fri, 21 Jan 2022 20:50:40 +0100 |
Pierre-Yves David |
test-http-bad-server: rename config to use `-`
|
Tue, 18 Jan 2022 21:29:43 +0100 |
Pierre-Yves David |
test-http-bad-server: move the extension in `testlib`
|
Mon, 17 Jan 2022 19:29:41 +0100 |
Pierre-Yves David |
requirements: remove the `localrepo.supportedformat` attribute
|
Mon, 17 Jan 2022 22:48:16 +0100 |
Pierre-Yves David |
requirements: sort _basesupported
|
Mon, 17 Jan 2022 19:28:10 +0100 |
Pierre-Yves David |
requirements: move the comment about manifestv2 in the module
|
Mon, 17 Jan 2022 19:26:36 +0100 |
Pierre-Yves David |
stream-clone: add a explicit set list requirements relevant to stream clone
|
Mon, 24 Jan 2022 11:49:06 +0100 |
Pierre-Yves David |
stream-clone: filter possible missing requirements using all supported one
|
Mon, 17 Jan 2022 19:18:20 +0100 |
Pierre-Yves David |
requirements: move "bookmark in store" requirements in the right module
|
Mon, 17 Jan 2022 18:51:47 +0100 |
Pierre-Yves David |
stream-clone: add a explicit test for format change during stream clone
|
Fri, 14 Jan 2022 18:02:25 +0100 |
Pierre-Yves David |
stream-clone: factor computation of requirement of a stream clone
|
Fri, 14 Jan 2022 17:57:49 +0100 |
Pierre-Yves David |
stream-clone: factor computation of new clone requirement out
|
Tue, 18 Jan 2022 00:07:43 +0100 |
Pierre-Yves David |
stream-clone: drop some outdated lines in test-stream-bundle-v2.t
|
Mon, 24 Jan 2022 08:35:14 -0800 |
Martin von Zweigbergk |
relnotes: add note about changed labels texts
|
Fri, 21 Jan 2022 13:48:48 -0800 |
Martin von Zweigbergk |
graft: attempt to make merge labels more helpful
|
Fri, 21 Jan 2022 13:49:11 -0800 |
Martin von Zweigbergk |
shelve: attempt to make merge labels more helpful
|
Fri, 21 Jan 2022 13:48:18 -0800 |
Martin von Zweigbergk |
histedit: attempt to make merge labels more helpful
|
Tue, 18 Jan 2022 13:23:49 -0800 |
Martin von Zweigbergk |
update: set custom conflict label for base commit
|
Tue, 18 Jan 2022 15:04:55 -0800 |
Martin von Zweigbergk |
merge: set custom conflict label for base commit
|
Tue, 18 Jan 2022 14:57:15 -0800 |
Martin von Zweigbergk |
rebase: set custom conflict label for base commit
|
Thu, 20 Jan 2022 11:06:52 -0800 |
Martin von Zweigbergk |
simplemerge: take over formatting of label from `filemerge`
|
Thu, 20 Jan 2022 16:16:05 -0800 |
Martin von Zweigbergk |
filemerge: pass `simplemerge.MergeInput` to tool functions
|
Thu, 20 Jan 2022 14:42:50 -0800 |
Martin von Zweigbergk |
filemerge: work with `simplemerge.MergeInput` in `filemerge()`
|
Thu, 20 Jan 2022 14:13:12 -0800 |
Martin von Zweigbergk |
filemerge: always define a "base" label
|
Thu, 20 Jan 2022 13:43:43 -0800 |
Martin von Zweigbergk |
filemerge: set default labels a little earlier
|
Tue, 18 Jan 2022 10:32:11 +0100 |
Raphaël Gomès |
helptext: add missing newline to Rust helptext
stable
|
Mon, 24 Jan 2022 21:17:04 -0800 |
Martin von Zweigbergk |
unamend: error out when running on merge commit
stable
|
Mon, 24 Jan 2022 21:12:19 -0800 |
Martin von Zweigbergk |
tests: demonstrate how `hg unamend` fails on merge commits
stable
|
Thu, 20 Jan 2022 11:17:09 -0800 |
Martin von Zweigbergk |
filemerge: remove unused arguments from `_merge()`
|
Thu, 20 Jan 2022 11:00:30 -0800 |
Martin von Zweigbergk |
simplemerge: take arguments as annotated context objects
|
Thu, 20 Jan 2022 09:04:39 -0800 |
Martin von Zweigbergk |
filemerge: make `labels` a required arg for `_premerge()`
|
Thu, 20 Jan 2022 14:46:16 -0800 |
Martin von Zweigbergk |
filemerge: remove unnecessary check for empty string
|
Thu, 20 Jan 2022 23:07:35 -0800 |
Martin von Zweigbergk |
tests: also test spaces in conflict marker labels
|
Mon, 17 Jan 2022 21:20:46 -0500 |
Valentin Gatien-Baron |
blackbox: change year in logs to ISO 8601 format
|
Mon, 17 Jan 2022 21:00:33 -0500 |
Valentin Gatien-Baron |
blackbox: add milliseconds to blackbox logs by default
|
Mon, 17 Jan 2022 20:47:46 -0500 |
Valentin Gatien-Baron |
blackbox: correct date format doc
|
Thu, 20 Jan 2022 14:06:36 +0000 |
Arseniy Alekseyev |
revlog: fix a bug where transaction can be aborted partially
stable
|
Thu, 20 Jan 2022 14:02:58 +0000 |
Arseniy Alekseyev |
revlog: demonstrate a bug where transaction can be aborted partially
stable
|
Tue, 18 Jan 2022 10:27:13 +0100 |
Raphaël Gomès |
branching: merge with stable
|
Thu, 30 Dec 2021 13:25:44 +0100 |
Dan Villiom Podlaski Christiansen |
rust: fix build errors on darwin
stable
|
Mon, 17 Jan 2022 12:50:13 +0100 |
Simon Sapin |
rust: Fix outdated comments in OwningDirstateMap
|
Fri, 14 Jan 2022 09:28:44 -0800 |
Martin von Zweigbergk |
merge: consider the file merged when using :merge-{local,other}
|
Fri, 14 Jan 2022 08:44:36 -0800 |
Martin von Zweigbergk |
simplemerge: delete unused exception class `CantReprocessAndShowBase`
|
Tue, 11 Jan 2022 22:13:56 -0800 |
Martin von Zweigbergk |
simplemerge: change _minimize() to minimize a single conflict
|
Tue, 11 Jan 2022 22:03:55 -0800 |
Martin von Zweigbergk |
simplemerge: make minimize() a free function
|
Tue, 11 Jan 2022 21:56:27 -0800 |
Martin von Zweigbergk |
simplemerge: simplify and rename `render_markers()`
|
Tue, 11 Jan 2022 16:23:10 -0800 |
Martin von Zweigbergk |
simplemerge: split out function for rendering :merge3 conflict markers
|
Fri, 07 Jan 2022 23:29:19 -0800 |
Martin von Zweigbergk |
simplemerge: move default labels to simplemerge extension
|
Fri, 07 Jan 2022 22:23:44 -0800 |
Martin von Zweigbergk |
simplemerge: use same newline detection for :mergediff as for :merge[3]
|
Tue, 11 Jan 2022 16:54:42 -0800 |
Martin von Zweigbergk |
simplemerge: clarify names of functions that render conflict markers
|
Fri, 07 Jan 2022 22:16:22 -0800 |
Martin von Zweigbergk |
simplemerge: make merge_lines() a free function
|
Fri, 07 Jan 2022 18:42:31 -0800 |
Martin von Zweigbergk |
simplemerge: convert `merge_lines()` away from generator
|
Tue, 14 Dec 2021 13:12:56 -0800 |
Martin von Zweigbergk |
simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels
|
Fri, 14 Jan 2022 10:25:45 -0800 |
Martin von Zweigbergk |
rust: upgrade `rand*` crates
|
Thu, 06 Jan 2022 22:09:40 -0800 |
Martin von Zweigbergk |
logcmdutil: raise `StateError` when file to follow doesn't exist
|
Thu, 06 Jan 2022 22:03:21 -0800 |
Martin von Zweigbergk |
logcmdutil: raise `InputError` on bad CLI arguments
|
Mon, 10 Jan 2022 18:04:41 -0500 |
Matt Harbison |
subrepo: make -S work again on Windows for incoming/outgoing to remote repos
stable
|
Sun, 09 Jan 2022 13:35:30 +0100 |
Cédric Krier |
tests: support pygments 2.11 (issue6628)
|
Mon, 03 Jan 2022 01:09:56 +0100 |
Joerg Sonnenberger |
exchange: add fast path for subrepo check on push
|
Wed, 05 Jan 2022 11:34:54 -0800 |
Martin von Zweigbergk |
simplemerge: rewrite `merge_lines()` using `merge_groups()`
|
Thu, 06 Jan 2022 09:03:17 -0800 |
Martin von Zweigbergk |
simplemerge: make merge_groups() yield only 2-tuples
|
Fri, 07 Jan 2022 14:40:21 +0100 |
Simon Sapin |
rhg: desambiguate status without decompressing filelog if possible
|
Thu, 06 Jan 2022 12:46:10 +0100 |
Simon Sapin |
filelog: add a comment explaining a fast path in filerevisioncopied()
|
Tue, 21 Dec 2021 21:26:14 +0100 |
Simon Sapin |
rhg: Store p1, p2, and hash in RevlogEntry
|
Tue, 21 Dec 2021 21:23:46 +0100 |
Simon Sapin |
rhg: RevlogEntry::uncompressed_len is signed
|
Tue, 21 Dec 2021 18:50:44 +0100 |
Simon Sapin |
rhg: Expose FilelogEntry that wraps RevlogEntry
|
Tue, 21 Dec 2021 18:35:58 +0100 |
Simon Sapin |
rhg: Add RevlogEntry::data that does delta resolution
|
Tue, 21 Dec 2021 15:57:30 +0100 |
Simon Sapin |
rhg: Rename some revlog-related types and methods
|
Wed, 05 Jan 2022 13:36:05 -0500 |
Augie Fackler |
git: add opener attribute to gitstore
|
Thu, 06 Jan 2022 09:55:28 +0100 |
Raphaël Gomès |
branching: merge stable into default
|
Wed, 05 Jan 2022 17:53:57 +0100 |
Raphaël Gomès |
Added signature for changeset 799fdf4cca80
stable
|
Wed, 05 Jan 2022 17:53:03 +0100 |
Raphaël Gomès |
Added tag 6.0.1 for changeset 799fdf4cca80
stable
|
Fri, 26 Nov 2021 14:29:05 +0100 |
Raphaël Gomès |
docs: update Rust readme with a mention of `rhg`
stable 6.0.1
|
Fri, 26 Nov 2021 12:21:03 +0100 |
Raphaël Gomès |
docs: fix typos and wording for the persistent-nodemap feature
stable
|
Fri, 26 Nov 2021 12:17:51 +0100 |
Raphaël Gomès |
docs: add missing dirstate-v2 documentation
stable
|
Fri, 26 Nov 2021 14:28:27 +0100 |
Raphaël Gomès |
docs: add documentation about Rust
stable
|
Thu, 23 Dec 2021 14:49:28 +0100 |
Raphaël Gomès |
dirstate: remove deprecated API
|
Thu, 23 Dec 2021 14:49:05 +0100 |
Raphaël Gomès |
discovery: remove deprecated API
|
Thu, 23 Dec 2021 14:48:31 +0100 |
Raphaël Gomès |
revlog: remove deprecated APIs
|
Thu, 23 Dec 2021 14:47:52 +0100 |
Raphaël Gomès |
urls: remove deprecated APIs
|
Thu, 23 Dec 2021 14:47:33 +0100 |
Raphaël Gomès |
remotefilelog: remove deprecated API
|
Tue, 07 Dec 2021 16:44:22 +0100 |
Raphaël Gomès |
exchangev2: remove it
|
Thu, 30 Dec 2021 13:25:44 +0100 |
Dan Villiom Podlaski Christiansen |
rust: fix build errors on darwin
|
Tue, 04 Jan 2022 14:21:22 -0500 |
Augie Fackler |
merge: with stable
|
Fri, 15 Feb 2019 17:20:32 -0500 |
Jordi Gutiérrez Hermoso |
help: properly document the default pattern
|
Mon, 03 Jan 2022 10:43:17 +0100 |
Raphaël Gomès |
heptapod-ci: make Windows jobs manual again
stable
|
Wed, 25 Aug 2021 17:14:47 +0200 |
Julien Cristau |
tests: allow for variation in zstd output as seen on s390x and powerpc
stable
|
Fri, 10 Dec 2021 16:25:02 +0100 |
pacien |
hg-core: dedup LazyAncestors Iterator impl
|
Tue, 16 Nov 2021 18:54:05 +0100 |
pacien |
hg-cpython: use ancestor iterator impls from vcsgraph
|
Fri, 10 Dec 2021 15:27:22 +0100 |
pacien |
hg-cpython: implement vcsgraph::Graph for our Index
|
Fri, 10 Dec 2021 15:22:24 +0100 |
pacien |
rust: add vcsgraph crate as dependency
|
Tue, 07 Dec 2021 23:01:20 -0800 |
Martin von Zweigbergk |
simplemerge: don't calculate conflict labels when resolving automatically
|
Tue, 07 Dec 2021 22:45:31 -0800 |
Martin von Zweigbergk |
simplemerge: remove now-unused `localorother` argument from `merge_lines()`
|
Tue, 07 Dec 2021 22:33:18 -0800 |
Martin von Zweigbergk |
simplemerge: add a specialized function for "union", "local", "other"
|
Sat, 18 Dec 2021 11:47:03 +0100 |
Simon Sapin |
rhg: Fall back to Python if verbose status is requested by config
|
Fri, 17 Dec 2021 17:56:13 +0100 |
Simon Sapin |
rhg: Accept different "invalid ignore pattern" error message formatting
|
Fri, 17 Dec 2021 16:54:22 +0100 |
Simon Sapin |
rhg: Properly format warnings related to ignore patterns
|
Tue, 09 Nov 2021 18:17:52 +0100 |
Simon Sapin |
rhg: Sub-repositories are not supported
|
Tue, 07 Dec 2021 17:48:50 -0800 |
Martin von Zweigbergk |
simplemerge: make `localorother` a "mode" instead of a separate thing
|
Tue, 07 Dec 2021 14:11:58 -0800 |
Martin von Zweigbergk |
simplemerge: avoid a call to `pycompat.strkwargs()`
|
Mon, 06 Dec 2021 23:17:43 -0800 |
Martin von Zweigbergk |
simplemerge: stop merging file flags
|
Tue, 07 Dec 2021 21:17:18 -0800 |
Martin von Zweigbergk |
filemerge: stop returning always-`True` value
|
Mon, 06 Dec 2021 13:43:00 -0800 |
Martin von Zweigbergk |
filemerge: remove unused `orig` argument from tool functions
|
Mon, 06 Dec 2021 12:48:01 -0800 |
Martin von Zweigbergk |
filemerge: stop passing around 3 unused `None` values in `files` argument
|
Mon, 06 Dec 2021 13:15:40 -0800 |
Martin von Zweigbergk |
filemerge: rename backup variables from `back` to `backup`
|
Sat, 18 Dec 2021 20:56:52 -0500 |
Matt Harbison |
setup.py: fix some documentation typos
|
Fri, 17 Dec 2021 14:15:08 +0100 |
Simon Sapin |
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
|
Wed, 15 Dec 2021 15:28:41 +0100 |
Pierre-Yves David |
rank: actually persist revision's rank in changelog-v2
|
Tue, 14 Dec 2021 23:56:38 +0100 |
Pierre-Yves David |
rank: add a "rank" value to the revlog-entry tuple
|
Wed, 15 Dec 2021 14:50:07 +0100 |
Pierre-Yves David |
changelog-v2: fix an assertion error to display the right data
|
Tue, 14 Dec 2021 19:24:24 +0100 |
Pierre-Yves David |
changelog-v2: use helper constant in the code to pack/unpack entries
|
Wed, 15 Dec 2021 15:28:30 +0100 |
Pierre-Yves David |
revlog: add some information about the revision we cannot find
|
Thu, 16 Dec 2021 17:34:51 +0100 |
Simon Sapin |
rhg: Use binary search in manifest lookup
|
Mon, 29 Nov 2021 12:27:33 +0000 |
Arseniy Alekseyev |
sparse: lock the store when updating requirements config
stable
|
Tue, 16 Nov 2021 17:35:57 +0000 |
Arseniy Alekseyev |
sparse: demonstrate a bug when used with safe-share
stable
|
Fri, 17 Dec 2021 11:46:30 +0100 |
Simon Sapin |
rust: Upgrade to format-bytes 0.3
|
Tue, 14 Dec 2021 20:13:10 -0500 |
Matt Harbison |
pytype: stop excluding ssutil.py
|
Tue, 14 Dec 2021 19:13:30 -0500 |
Matt Harbison |
pytype: stop excluding wireprotoserver.py
|
Tue, 14 Dec 2021 18:36:07 -0500 |
Matt Harbison |
pytype: stop excluding pycompat.py
|
Tue, 14 Dec 2021 17:29:30 -0500 |
Matt Harbison |
procutil: avoid an uninitialized variable usage on tempfile exception
|
Tue, 14 Dec 2021 17:25:46 -0500 |
Matt Harbison |
pytype: stop excluding procutil.py
|
Tue, 14 Dec 2021 17:06:32 -0500 |
Matt Harbison |
pytype: stop excluding chgserver.py
|
Mon, 13 Dec 2021 22:46:43 -0500 |
Matt Harbison |
pytype: stop excluding webcommands.py
|
Mon, 13 Dec 2021 20:45:31 -0500 |
Matt Harbison |
tests: drop an obsolete comment about a pytype failure
|
Mon, 13 Dec 2021 20:19:09 -0500 |
Matt Harbison |
pytype: stop excluding patch.py
|
Mon, 13 Dec 2021 19:34:06 -0500 |
Matt Harbison |
pytype: stop excluding statprof.py
|
Mon, 13 Dec 2021 17:59:36 -0500 |
Matt Harbison |
statprof: convert a few exception byte strings to str
|
Mon, 13 Dec 2021 16:42:36 -0500 |
Matt Harbison |
pytype: stop excluding wireprotov2server.py
|
Mon, 13 Dec 2021 14:43:10 -0500 |
Matt Harbison |
pytype: stop excluding stringutil.py
|
Mon, 13 Dec 2021 00:25:38 -0500 |
Matt Harbison |
pytype: stop excluding cmdutil.py
|
Mon, 13 Dec 2021 00:04:53 -0500 |
Matt Harbison |
pytype: stop excluding copies.py
|
Sun, 12 Dec 2021 22:29:46 -0500 |
Matt Harbison |
copies: fix some documentation typos
|
Sun, 12 Dec 2021 22:24:16 -0500 |
Matt Harbison |
copies: drop an unused variable
|
Sun, 12 Dec 2021 22:09:13 -0500 |
Matt Harbison |
pytype: stop excluding lsprof.py
|
Sun, 12 Dec 2021 21:10:02 -0500 |
Matt Harbison |
pytype: stop excluding changegroup.py
|
Sun, 12 Dec 2021 20:01:05 -0500 |
Matt Harbison |
pytype: stop excluding upgrade.py
|
Tue, 14 Dec 2021 20:36:36 +0100 |
Simon Sapin |
rhg: Skip reading the contents of ambiguous files in some cases
|
Tue, 14 Dec 2021 19:47:33 +0100 |
Simon Sapin |
rhg: Mark it as expected that the issue6528 bug is not reproduced
|
Tue, 14 Dec 2021 13:41:34 -0800 |
Martin von Zweigbergk |
filemerge: remove leftover documentation of removed argument
|
Mon, 13 Dec 2021 14:44:16 -0500 |
Matt Harbison |
merge with stable
|
Mon, 13 Dec 2021 14:37:16 +0100 |
Simon Sapin |
rhg: Print "bad match" errors in rhg status
|
Tue, 07 Dec 2021 15:14:08 +0100 |
Pierre-Yves David |
share: make it possible to control the working copy format variant
|
Tue, 07 Dec 2021 14:51:45 +0100 |
Pierre-Yves David |
share: move the requirement initialisation code around
|
Wed, 08 Dec 2021 05:35:32 +0100 |
Pierre-Yves David |
test: use `hg debugrequires` instead of `cat` in some tests
|
Wed, 08 Dec 2021 05:42:01 +0100 |
Pierre-Yves David |
test: simplify `debugformat` matching in test-phases.t
|
Tue, 07 Dec 2021 23:49:35 +0100 |
Pierre-Yves David |
test: simplify `debugformat` matching in test-copies-chain-merge
|
Tue, 07 Dec 2021 15:53:55 -0800 |
Kyle Lippincott |
status: when extracting arguments from `opts`, use the same default values
|
Tue, 07 Dec 2021 15:48:22 -0800 |
Kyle Lippincott |
directaccess: fix uses of commands.status() that don't go through flag parsing
|
Sun, 07 Nov 2021 16:25:42 -0500 |
Valentin Gatien-Baron |
test: add test for a former race resulting in bad dirstate
|
Tue, 07 Dec 2021 18:57:43 +0000 |
Arseniy Alekseyev |
rhg: fix a crash on non-generaldelta revlogs
|
Tue, 07 Dec 2021 18:12:13 +0000 |
Arseniy Alekseyev |
rhg: centralize index header parsing
|
Tue, 07 Dec 2021 17:50:19 +0000 |
Arseniy Alekseyev |
rhg: demonstrate that rhg breaks on non-generaldelta revlogs
|
Fri, 10 Dec 2021 23:08:25 +0100 |
Simon Sapin |
tests: add a short `sleep` in test-status.t
|
Fri, 10 Dec 2021 16:18:58 +0100 |
Simon Sapin |
rhg: Add support for `rhg status --copies`
|
Fri, 10 Dec 2021 16:57:39 +0100 |
Simon Sapin |
rhg: refactor relativize_path into a struct + method
|
Fri, 10 Dec 2021 16:31:16 +0100 |
Simon Sapin |
rhg: refactor display_status_paths with a struct for common arguments
|
Fri, 10 Dec 2021 14:27:00 +0100 |
Simon Sapin |
rhg: Add support for ui.ignore and ui.ignore.* config
|
Fri, 10 Dec 2021 17:20:21 +0100 |
Pierre-Yves David |
doc: remove a spurious ^L in some doc
|
Mon, 06 Dec 2021 21:30:32 +0100 |
Pierre-Yves David |
upgrade: drop some dead code
|
Mon, 06 Dec 2021 17:54:39 +0100 |
Pierre-Yves David |
upgrade: only process revlogs that needs it by default
|
Mon, 06 Dec 2021 17:13:26 +0100 |
Pierre-Yves David |
upgrade: issue a message when a revlog type has to be upgraded
|
Mon, 06 Dec 2021 17:12:21 +0100 |
Pierre-Yves David |
upgrade: explicitly warn when a `--no-xxx` flag is overwritten
|