| 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
|
| Tue, 18 Jan 2022 10:27:13 +0100 |
Raphaël Gomès |
branching: merge with 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
|
| 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
|
| 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
|
| 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
|
