| 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
|
| 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
|
| 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
|
| 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 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
|
