| Fri, 18 Feb 2022 13:14:32 +0100 |
Raphaël Gomès |
relnotes: add 6.0.3
stable
|
changeset |
files
|
| Fri, 18 Feb 2022 12:51:23 +0100 |
Raphaël Gomès |
windows: adjust test output in test-merge-tools.t
stable
|
changeset |
files
|
| Fri, 18 Feb 2022 12:51:06 +0100 |
Raphaël Gomès |
windows: generalize output for test-status-tracked-key.t
stable
|
changeset |
files
|
| Tue, 22 Feb 2022 11:51:08 +0100 |
Pierre-Yves David |
windows: skip a section of a test that is legitimately broken on windows
stable
|
changeset |
files
|
| Fri, 18 Feb 2022 14:32:26 +0100 |
Raphaël Gomès |
Added signature for changeset c00d3ce4e94b
stable
|
changeset |
files
|
| Fri, 18 Feb 2022 14:32:09 +0100 |
Raphaël Gomès |
Added tag 6.1rc0 for changeset c00d3ce4e94b
stable
|
changeset |
files
|
| Fri, 18 Feb 2022 14:27:43 +0100 |
Raphaël Gomès |
branching: merge default into stable for 6.1 freeze
stable 6.1rc0
|
changeset |
files
|
| Fri, 18 Feb 2022 12:58:44 +0100 |
Raphaël Gomès |
branching: merge 6.0.3 stable into default
|
changeset |
files
|
| Fri, 18 Feb 2022 11:37:08 +0100 |
Raphaël Gomès |
branching: merge stable into default
|
changeset |
files
|
| Thu, 17 Feb 2022 07:34:49 +0100 |
Pierre-Yves David |
tracked-key: remove the dual write and rename to tracked-hint
|
changeset |
files
|
| Thu, 17 Feb 2022 06:41:54 +0100 |
Pierre-Yves David |
tracked-file: rename the format option to use `use-`
|
changeset |
files
|
| Thu, 17 Feb 2022 06:35:42 +0100 |
Pierre-Yves David |
tracked-key: update the requirement value
|
changeset |
files
|
| Thu, 17 Feb 2022 06:32:03 +0100 |
Pierre-Yves David |
tracked-key: make it possible to upgrade to and downgrade from the feature
|
changeset |
files
|
| Mon, 31 Jan 2022 18:13:00 +0300 |
Anton Shestakov |
obsolete: don't use os.stat in repo.obsstore.__nonzero__ if it's static HTTP
|
changeset |
files
|
| Mon, 14 Feb 2022 22:49:03 -0800 |
Martin von Zweigbergk |
filemerge: make `_maketempfiles()` more reusable
|
changeset |
files
|
| Mon, 14 Feb 2022 22:16:29 -0800 |
Martin von Zweigbergk |
filemerge: reduce some duplication in `_maketempfiles()`
|
changeset |
files
|
| Mon, 14 Feb 2022 22:11:50 -0800 |
Martin von Zweigbergk |
filemerge: use leverage `util.readfile()` in `_maketempfiles()`
|
changeset |
files
|
| Mon, 14 Feb 2022 22:04:50 -0800 |
Martin von Zweigbergk |
filemerge: move removal of `.orig` extension on temp file close to context
|
changeset |
files
|
| Mon, 14 Feb 2022 21:52:18 -0800 |
Martin von Zweigbergk |
filemerge: remove `uselocalpath` argument from `_maketempfiles()`
|
changeset |
files
|
| Fri, 11 Feb 2022 22:39:53 -0800 |
Martin von Zweigbergk |
filemerge: remove an unnecessary join with absolute path
|
changeset |
files
|
| Fri, 11 Feb 2022 21:39:55 -0800 |
Martin von Zweigbergk |
filemerge: when using in-memory merge, always put backup files in temp dir
|
changeset |
files
|
| Tue, 15 Feb 2022 20:18:57 -0800 |
Martin von Zweigbergk |
filemerge: remove unused `repo` argument from `_maketempfiles()`
|
changeset |
files
|
| Tue, 15 Feb 2022 23:45:30 +0100 |
Pierre-Yves David |
upgrade: make dirstate-v2 format variant compatible with share
|
changeset |
files
|
| Tue, 15 Feb 2022 23:09:07 +0100 |
Pierre-Yves David |
upgrade: prepare code (and output) for the idea of upgrading share
|
changeset |
files
|
| Tue, 15 Feb 2022 13:32:30 -0500 |
Augie Fackler |
sparse: add timing block for parsing sparse configs
|
changeset |
files
|
| Tue, 15 Feb 2022 13:32:11 -0500 |
Augie Fackler |
narrowspec: add timing block for validating narrowspec
|
changeset |
files
|
| Tue, 15 Feb 2022 20:24:46 -0800 |
Martin von Zweigbergk |
branching: merge with stable
|
changeset |
files
|
| Fri, 11 Feb 2022 16:52:48 -0800 |
Martin von Zweigbergk |
filemerge: put temporary files in single temp dir by default
|
changeset |
files
|
| Tue, 15 Feb 2022 05:20:46 +0100 |
Pierre-Yves David |
dirstate-tracked-key: update the config value to match latest discussion
|
changeset |
files
|
| Fri, 26 Nov 2021 15:38:04 +0100 |
Raphaël Gomès |
rhg: signal when falling back in logs
|
changeset |
files
|
| Mon, 07 Feb 2022 13:23:58 +0100 |
pacien |
revlog: register changelogv2 C implementation in parsers
|
changeset |
files
|
| Mon, 14 Feb 2022 12:34:02 +0100 |
pacien |
revlog: implement changelogv2 packing and unpacking in C
|
changeset |
files
|
| Thu, 10 Feb 2022 16:20:14 +0100 |
pacien |
revlog: memset whole record instead of dealing with padding
|
changeset |
files
|
| Fri, 11 Feb 2022 05:37:19 +0100 |
Pierre-Yves David |
revlog: do not compute node location by hand in index_invalidate_added
|
changeset |
files
|
| Fri, 28 Jan 2022 11:54:44 +0100 |
pacien |
rank: compute property incrementally
|
changeset |
files
|
| Fri, 28 Jan 2022 11:45:33 +0100 |
Pierre-Yves David |
rank: add test with golden values
|
changeset |
files
|
| Fri, 28 Jan 2022 11:45:18 +0100 |
pacien |
rank: add minimal test
|
changeset |
files
|
| Fri, 28 Jan 2022 11:35:41 +0100 |
Pierre-Yves David |
rank: add context and template keyword
|
changeset |
files
|
| Fri, 28 Jan 2022 11:33:01 +0100 |
Pierre-Yves David |
rank: naive rank property computation and retrieval
|
changeset |
files
|
| Mon, 07 Feb 2022 22:54:38 -0800 |
Martin von Zweigbergk |
filemerge: move check for identical sides out of filemerge()
|
changeset |
files
|
| Mon, 07 Feb 2022 20:12:09 -0800 |
Martin von Zweigbergk |
mergestate: use an early return for trivial merges
|
changeset |
files
|
| Mon, 07 Feb 2022 14:07:04 -0800 |
Martin von Zweigbergk |
simplemerge: remove now-unused arguments
|
changeset |
files
|
| Tue, 18 Jan 2022 13:22:55 -0800 |
Martin von Zweigbergk |
merge: fix documented order of `labels` argument
|
changeset |
files
|
| Tue, 18 Jan 2022 12:57:55 -0800 |
Martin von Zweigbergk |
filemerge: when not keeping premerge, don't write markers to context
|
changeset |
files
|
| Fri, 14 Jan 2022 08:17:13 -0800 |
Martin von Zweigbergk |
simplemerge: move printing of merge result to extension
|
changeset |
files
|
| Thu, 10 Feb 2022 15:48:01 -0800 |
Martin von Zweigbergk |
simplemerge: remove code for checking binary input now that callers do it
|
changeset |
files
|
| Thu, 10 Feb 2022 15:27:58 -0800 |
Martin von Zweigbergk |
simplemerge: let filemerge check for binary inputs
|
changeset |
files
|
| Thu, 10 Feb 2022 13:36:09 -0800 |
Martin von Zweigbergk |
simplemerge: let extension check for binary inputs (unless `--text`)
|
changeset |
files
|
| Thu, 10 Feb 2022 11:00:32 -0800 |
Martin von Zweigbergk |
simplemerge: store input data in MergeInput
|
changeset |
files
|
| Fri, 04 Feb 2022 18:36:36 -0800 |
Martin von Zweigbergk |
simplemerge: convert MergeInput to regular, non-attr.ib class
|
changeset |
files
|
| Thu, 10 Feb 2022 09:59:07 -0800 |
Martin von Zweigbergk |
simplemerge: replace `**opts` passed to `simplemerge()` by keyword arguments
|
changeset |
files
|
| Thu, 03 Feb 2022 18:14:25 +0100 |
Pierre-Yves David |
narrow: add support for merging add and remove outside of the tracked set
|
changeset |
files
|
| Fri, 21 Jan 2022 17:54:03 +0100 |
Simon Sapin |
status: prefer relative paths in Rust code
|
changeset |
files
|
| Mon, 14 Feb 2022 18:51:43 +0100 |
Simon Sapin |
rust: remove unused `StatusError::IO` enum variant
|
changeset |
files
|
| Mon, 14 Feb 2022 18:57:12 +0100 |
Simon Sapin |
rust: fix code formatting
|
changeset |
files
|
| Mon, 07 Feb 2022 00:33:22 -0500 |
Valentin Gatien-Baron |
sparse: rework debugsparse's interface
|
changeset |
files
|
| Wed, 09 Feb 2022 13:04:37 -0500 |
Mitchell Hentges |
color: don't infer vt status from TERM on Windows
|
changeset |
files
|
| Thu, 10 Feb 2022 19:26:10 +0100 |
Simon Sapin |
rhg: enable `rhg status` by default, without config or env opt-in
|
changeset |
files
|
| Tue, 08 Feb 2022 14:20:58 +0100 |
Simon Sapin |
rhg: Colorize `rhg status` output when appropriate
|
changeset |
files
|
| Thu, 10 Feb 2022 12:59:32 +0100 |
Simon Sapin |
rhg: Add support for colored output
|
changeset |
files
|