| Fri, 28 Jan 2022 11:45:18 +0100 |
pacien |
rank: add minimal test
|
| Fri, 28 Jan 2022 11:35:41 +0100 |
Pierre-Yves David |
rank: add context and template keyword
|
| Fri, 28 Jan 2022 11:33:01 +0100 |
Pierre-Yves David |
rank: naive rank property computation and retrieval
|
| Mon, 07 Feb 2022 22:54:38 -0800 |
Martin von Zweigbergk |
filemerge: move check for identical sides out of filemerge()
|
| Mon, 07 Feb 2022 20:12:09 -0800 |
Martin von Zweigbergk |
mergestate: use an early return for trivial merges
|
| Mon, 07 Feb 2022 14:07:04 -0800 |
Martin von Zweigbergk |
simplemerge: remove now-unused arguments
|
| Tue, 18 Jan 2022 13:22:55 -0800 |
Martin von Zweigbergk |
merge: fix documented order of `labels` argument
|
| Tue, 18 Jan 2022 12:57:55 -0800 |
Martin von Zweigbergk |
filemerge: when not keeping premerge, don't write markers to context
|
| Fri, 14 Jan 2022 08:17:13 -0800 |
Martin von Zweigbergk |
simplemerge: move printing of merge result to extension
|
| Thu, 10 Feb 2022 15:48:01 -0800 |
Martin von Zweigbergk |
simplemerge: remove code for checking binary input now that callers do it
|
| Thu, 10 Feb 2022 15:27:58 -0800 |
Martin von Zweigbergk |
simplemerge: let filemerge check for binary inputs
|
| Thu, 10 Feb 2022 13:36:09 -0800 |
Martin von Zweigbergk |
simplemerge: let extension check for binary inputs (unless `--text`)
|
| Thu, 10 Feb 2022 11:00:32 -0800 |
Martin von Zweigbergk |
simplemerge: store input data in MergeInput
|
| Fri, 04 Feb 2022 18:36:36 -0800 |
Martin von Zweigbergk |
simplemerge: convert MergeInput to regular, non-attr.ib class
|
| Thu, 10 Feb 2022 09:59:07 -0800 |
Martin von Zweigbergk |
simplemerge: replace `**opts` passed to `simplemerge()` by keyword arguments
|
| Wed, 25 Aug 2021 19:55:20 -0700 |
Gregory Szorc |
automation: use gp3 volume type
stable
|
| Thu, 26 Aug 2021 17:47:50 -0700 |
Gregory Szorc |
automation: use m6i instances
stable
|
| Thu, 03 Feb 2022 18:14:25 +0100 |
Pierre-Yves David |
narrow: add support for merging add and remove outside of the tracked set
|
| Fri, 21 Jan 2022 17:54:03 +0100 |
Simon Sapin |
status: prefer relative paths in Rust code
|
| Mon, 14 Feb 2022 18:51:43 +0100 |
Simon Sapin |
rust: remove unused `StatusError::IO` enum variant
|
| Tue, 15 Feb 2022 15:52:44 +0100 |
Raphaël Gomès |
copyright: it's 2022
stable
|
| Mon, 14 Feb 2022 19:03:22 +0100 |
Raphaël Gomès |
hghave: update rustfmt criterion
stable
|
| Fri, 11 Feb 2022 23:43:17 +0100 |
Raphaël Gomès |
dirstate-v2: fix infinite loop in pure packer
stable
|
| Tue, 15 Feb 2022 15:33:33 +0100 |
Mathias De Mare |
contrib: refer to RHEL and derivatives instead of CentOS specifically
stable
|
| Mon, 14 Feb 2022 11:32:03 +0100 |
Mathias De Mare |
packaging: replace centos8 by rockylinux 8
stable
|
| Mon, 14 Feb 2022 18:57:12 +0100 |
Simon Sapin |
rust: fix code formatting
|
| Mon, 07 Feb 2022 00:33:22 -0500 |
Valentin Gatien-Baron |
sparse: rework debugsparse's interface
|
| Wed, 09 Feb 2022 13:04:37 -0500 |
Mitchell Hentges |
color: don't infer vt status from TERM on Windows
|
| Thu, 10 Feb 2022 19:26:10 +0100 |
Simon Sapin |
rhg: enable `rhg status` by default, without config or env opt-in
|
| Tue, 08 Feb 2022 14:20:58 +0100 |
Simon Sapin |
rhg: Colorize `rhg status` output when appropriate
|
| Thu, 10 Feb 2022 12:59:32 +0100 |
Simon Sapin |
rhg: Add support for colored output
|
| Thu, 10 Feb 2022 13:56:43 +0100 |
Simon Sapin |
rhg: Add parsing for the --color global CLI argument
|
| Thu, 10 Feb 2022 12:52:25 +0100 |
Simon Sapin |
rhg: Make Ui::new falliable, add Ui::new_infallible
|
| Thu, 10 Feb 2022 12:12:56 +0100 |
Simon Sapin |
rhg: Pass a &Config to Ui::new
|
| Thu, 10 Feb 2022 11:58:04 +0100 |
Simon Sapin |
rhg: Add support for HGPLAINEXPECT
|
| Thu, 10 Feb 2022 13:24:38 -0500 |
Augie Fackler |
merge: with stable
|
| Wed, 09 Feb 2022 16:07:50 +0100 |
Pierre-Yves David |
help: make the help for `safe-mismatch` real section
stable
|
| Wed, 09 Feb 2022 15:44:21 +0100 |
Pierre-Yves David |
help: avoid repeated value in the safe-mistmatch help
stable
|
| Wed, 09 Feb 2022 15:43:01 +0100 |
Pierre-Yves David |
help: add missing `.` in config reference
stable
|
| Mon, 07 Feb 2022 12:29:43 +0300 |
Anton Shestakov |
scmutil: obsrevs is already a frozenset
|
| Mon, 07 Feb 2022 12:25:46 +0300 |
Anton Shestakov |
obsolete: always return frozensets from obsolete.getrevs()
|
| Wed, 26 Jan 2022 13:18:48 +0100 |
pacien |
revlog: split revlog v1 and revlog v2 handling
|
| Wed, 26 Jan 2022 13:08:36 +0100 |
pacien |
revlog: extract entry byte offsets into named constants
|
| Mon, 07 Feb 2022 15:45:53 +0100 |
Mads Kiilerich |
doc: inspect.getargspec has been removed in Python 3.11
stable
|
| Mon, 07 Feb 2022 13:24:30 +0300 |
Anton Shestakov |
branchmap: split a long condition in branchcache.validfor(), add comments
|
| Sun, 06 Feb 2022 19:31:39 +0300 |
Anton Shestakov |
branchmap: don't add branch entries if there are no heads
|
| Sun, 06 Feb 2022 19:14:51 +0300 |
Anton Shestakov |
notify: don't produce errors if a revision is not found
|
| Thu, 03 Feb 2022 18:14:11 +0100 |
Pierre-Yves David |
narrow: allow merging non-conflicting change outside of the narrow spec
|
| Sun, 30 Jan 2022 06:01:42 +0100 |
Pierre-Yves David |
merge-actions: add some information about the "changes" the action do
|
| Sat, 29 Jan 2022 06:21:32 +0100 |
Pierre-Yves David |
merge-actions: have an attribute for narrow safetiness
|
| Fri, 28 Jan 2022 15:19:58 +0100 |
Pierre-Yves David |
merge-actions: add an explicite "no_op" attribute
|
| Fri, 28 Jan 2022 19:46:37 +0100 |
Pierre-Yves David |
merge-actions: gather all created action into a set
|
| Fri, 28 Jan 2022 17:08:30 +0100 |
Pierre-Yves David |
merge-actions: make merge action a full featured object
|
| Fri, 28 Jan 2022 16:25:41 +0100 |
Pierre-Yves David |
convert: use the merge action constant
|
| Fri, 28 Jan 2022 16:11:42 +0100 |
Pierre-Yves David |
large-file: use the merge action constant
|
| Fri, 28 Jan 2022 16:41:45 +0100 |
Pierre-Yves David |
merge: stop using merge action for pathconflict option
|
| Fri, 28 Jan 2022 14:25:51 +0100 |
Pierre-Yves David |
merge: break up a not-so-one-liner for readability
|
| Fri, 28 Jan 2022 14:25:45 +0100 |
Pierre-Yves David |
merge: break up a not-so-one-liner for readability
|
| Fri, 28 Jan 2022 14:25:39 +0100 |
Pierre-Yves David |
merge: break up a not-so-one-liner for readability
|
| Fri, 28 Jan 2022 14:25:32 +0100 |
Pierre-Yves David |
merge: break up a not-so-one-liner for readability
|
| Fri, 28 Jan 2022 14:25:05 +0100 |
Pierre-Yves David |
merge: break up two not-so-one-liner for extra readability
|
| Fri, 28 Jan 2022 14:24:41 +0100 |
Pierre-Yves David |
merge: break up a not-so-one-liner for readability
|
| Fri, 28 Jan 2022 14:24:30 +0100 |
Pierre-Yves David |
merge: break up a not-so-one-liner for readability
|
| Fri, 28 Jan 2022 14:23:56 +0100 |
Pierre-Yves David |
merge: break up a not-so-one-liner for readability
|
| Fri, 28 Jan 2022 14:23:49 +0100 |
Pierre-Yves David |
merge: break up a not-so-one-liner for readability
|
| Fri, 28 Jan 2022 14:23:37 +0100 |
Pierre-Yves David |
merge: break up a not-so-one-liner for readability
|
| Thu, 03 Feb 2022 06:49:48 +0100 |
Pierre-Yves David |
phabricator-refresh: add a magic value to skip it in the CI
|
| Thu, 27 Jan 2022 20:04:56 +0300 |
Anton Shestakov |
interfaces: add missing caches kwarg of localrepo.updatecaches()
|
| Mon, 31 Jan 2022 18:05:36 +0300 |
Anton Shestakov |
obsolete: don't import from .node twice
|
| Mon, 31 Jan 2022 18:04:11 +0300 |
Anton Shestakov |
dagop: don't import nullrev from .node twice
|
| Thu, 27 Jan 2022 22:24:11 +0100 |
Pierre-Yves David |
stream-clone: allow to change persistent-nodemap format during stream clone
|
| Thu, 27 Jan 2022 15:22:09 +0100 |
Pierre-Yves David |
stream-clone: add 5000 changesets to test-clone-stream-format
|
| Thu, 27 Jan 2022 15:22:04 +0100 |
Pierre-Yves David |
debugbuilddag: add a flag to allow running it from a non-empty repository
|
| Thu, 27 Jan 2022 17:04:40 +0100 |
Pierre-Yves David |
persistent-nodemap: properly delete all nodemap files on downgrade
|
| Sat, 15 Jan 2022 09:08:41 +0300 |
Anton Shestakov |
destutil: if wdp is obsolete, update to the closest non-obsolete ancestor
|
| Tue, 04 Jan 2022 23:38:39 +0300 |
Anton Shestakov |
discovery: port _postprocessobsolete() changes from evolve, add tests
|
| Fri, 07 Jan 2022 11:53:23 +0300 |
Anton Shestakov |
branchmap: skip obsolete revisions while computing heads
|
| Fri, 28 Jan 2022 19:07:52 +0300 |
Anton Shestakov |
obsolete: make sure windows tests pass when stat() is given a URL
|
| 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
|
