| Thu, 18 Jul 2024 12:36:12 +0200 |
Raphaël Gomès |
black: format the codebase with 23.3.0
|
| Tue, 23 Jul 2024 10:02:46 +0200 |
Raphaël Gomès |
Backout accidental publication of a large range of revisions
|
| Thu, 18 Jul 2024 12:36:12 +0200 |
Raphaël Gomès |
black: format the codebase with 23.3.0
|
| Thu, 02 Mar 2023 14:44:43 +0100 |
Pierre-Yves David |
branch: pass current transaction when writing branch in merge
|
| Wed, 25 Jan 2023 19:12:31 +0100 |
Pierre-Yves David |
dirstate: rename parentchange to changing_parents
|
| Wed, 25 Jan 2023 18:46:20 +0100 |
Pierre-Yves David |
dirstate: pass the repo to the `changeparent` method
|
| Thu, 12 Jan 2023 13:14:00 +0000 |
Arseniy Alekseyev |
merge: add mergeresult.mapaction to improve speed
|
| Wed, 04 Jan 2023 19:30:47 +0000 |
Arseniy Alekseyev |
merge: avoid dereferencing repo fields repeatedly
|
| Fri, 06 Jan 2023 18:09:19 +0000 |
Arseniy Alekseyev |
merge: skip syntactic path checks in [_checkunknownfile]
|
| Wed, 04 Jan 2023 17:14:33 +0000 |
Arseniy Alekseyev |
merge: cache the fs checks made during [_checkunknownfiles]
|
| Wed, 04 Jan 2023 19:13:41 +0000 |
Arseniy Alekseyev |
merge: don't pay for pathconflicts if there are none
|
| Fri, 06 Jan 2023 16:01:31 +0000 |
Arseniy Alekseyev |
debug: add a config to abort update early
|
| Thu, 16 Jun 2022 15:20:48 +0200 |
Raphaël Gomès |
branching: merge stable into default
|
| Tue, 14 Jun 2022 11:26:18 +0200 |
Pierre-Yves David |
purge: prevent a silly crash with --confirm --files
stable 6.1.4
|
| Tue, 31 May 2022 22:50:01 +0200 |
Manuel Jacob |
py3: catch FileNotFoundError instead of checking errno == ENOENT
|
| Mon, 21 Feb 2022 13:08:28 -0700 |
Gregory Szorc |
py3: use class X: instead of class X(object):
|
| Mon, 21 Feb 2022 11:11:59 -0700 |
Gregory Szorc |
merge: remove pycompat.iteritems()
|
| Thu, 03 Mar 2022 18:28:30 -0800 |
Gregory Szorc |
global: bulk replace simple pycompat.iteritems(x) with x.items()
|
| Thu, 03 Mar 2022 17:34:00 +0100 |
Gregory Szorc |
py2: remove simple from __future__ statements
|
| Mon, 28 Feb 2022 18:34:23 +0100 |
Raphaël Gomès |
merge: remove direct rustmod reference
stable 6.1
|
| Tue, 18 Jan 2022 13:22:55 -0800 |
Martin von Zweigbergk |
merge: fix documented order of `labels` argument
|
| Thu, 03 Feb 2022 18:14:25 +0100 |
Pierre-Yves David |
narrow: add support for merging add and remove outside of the tracked set
|
| Thu, 03 Feb 2022 18:14:11 +0100 |
Pierre-Yves David |
narrow: allow merging non-conflicting change outside of the narrow spec
|
| 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 17:08:30 +0100 |
Pierre-Yves David |
merge-actions: make merge action a full featured object
|
| 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
|
| Tue, 18 Jan 2022 13:23:49 -0800 |
Martin von Zweigbergk |
update: set custom conflict label for base commit
|
| Fri, 10 Dec 2021 17:20:21 +0100 |
Pierre-Yves David |
doc: remove a spurious ^L in some doc
|
| Thu, 02 Dec 2021 22:59:36 -0800 |
Martin von Zweigbergk |
mergestate: merge `preresolve()` into `resolve()`
|
| Fri, 26 Nov 2021 11:53:54 +0100 |
Raphaël Gomès |
typo: s/unkown/unknown across the codebase
|
| Wed, 17 Nov 2021 10:22:15 +0100 |
Pierre-Yves David |
update: filter the ambiguous mtime in update directly
|
| Wed, 17 Nov 2021 02:58:44 +0100 |
Pierre-Yves David |
dirstate: add a comment about a racy piece of code during updates
|
| Fri, 19 Nov 2021 15:39:35 -0800 |
Martin von Zweigbergk |
errors: use detailed exit code when trying to merge file outside narrowspec
|
| Thu, 21 Oct 2021 17:25:41 +0200 |
Raphaël Gomès |
branching: merge stable into default
|
| Mon, 18 Oct 2021 11:23:07 +0200 |
Simon Sapin |
dirstate: store mtimes with nanosecond precision in memory
|
| Tue, 19 Oct 2021 16:14:53 -0700 |
Kyle Lippincott |
merge-halt: fix issue with merge.on-failure=halt breaking unshelve
stable
|
| Thu, 08 Jul 2021 22:08:32 +0200 |
Pierre-Yves David |
sparse: adjust the temporary includes within a `parentchange` context
|
| Tue, 01 Jun 2021 15:19:08 -0700 |
Martin von Zweigbergk |
merge: make applyupdates() not mutate mresult argument
|
| Mon, 29 Mar 2021 01:52:06 +0200 |
Joerg Sonnenberger |
node: replace nullid and friends with nodeconstants class
|
| Thu, 25 Mar 2021 18:02:08 +0100 |
Raphaël Gomès |
contributor: change mentions of mpm to olivia
|
| Wed, 10 Mar 2021 13:14:32 +0530 |
Pulkit Goyal |
commit: get info from mergestate whether a file was merged or not
|
| Thu, 18 Mar 2021 18:24:59 -0400 |
Matt Harbison |
merge with stable
|
| Thu, 11 Mar 2021 18:33:39 -0500 |
Matt Harbison |
merge: force an exception message to bytes before printing as a warning
stable
|
| Fri, 29 Jan 2021 15:56:08 -0800 |
Martin von Zweigbergk |
errors: use StateError more in merge module
|
| Mon, 18 Jan 2021 10:24:11 +0100 |
Pierre-Yves David |
purge: also deal with directory with --confirm
|
| Mon, 18 Jan 2021 10:24:03 +0100 |
Pierre-Yves David |
purge: add a --confirm option
|
| Mon, 18 May 2020 17:29:53 -0400 |
Augie Fackler |
cleanup: use mergestate.unresolvedcount() instead of bool(list(unresolved()))
|
| Fri, 27 Nov 2020 17:03:29 -0500 |
Augie Fackler |
formating: upgrade to black 20.8b1
|
| Fri, 27 Nov 2020 16:59:14 -0500 |
Augie Fackler |
merge: remove spurious ' and trailing whitespace from triple-quoted string
|
