| 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
|
| Tue, 19 Jul 2022 12:41:46 +0200 |
Georges Racinet |
mergestate: action name was str
stable
|
| 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):
|
| Tue, 01 Mar 2022 20:52:32 -0800 |
Gregory Szorc |
py3: replace pycompat.itervalues(x) with x.values()
|
| 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, 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
|
| 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
|
| Tue, 07 Dec 2021 21:17:18 -0800 |
Martin von Zweigbergk |
filemerge: stop returning always-`True` value
|
| Fri, 03 Dec 2021 16:21:46 -0800 |
Martin von Zweigbergk |
filemerge: merge `premerge()` into `filemerge()`
|
| Fri, 03 Dec 2021 15:43:54 -0800 |
Martin von Zweigbergk |
mergestate: inline `_resolve()` into `resolve()`
|
| Fri, 03 Dec 2021 13:53:02 -0800 |
Martin von Zweigbergk |
mergestate: make `_resolve()` do both preresolve and resolve
|
| Thu, 02 Dec 2021 22:59:36 -0800 |
Martin von Zweigbergk |
mergestate: merge `preresolve()` into `resolve()`
|
| Thu, 30 Sep 2021 16:33:12 +0200 |
Pierre-Yves David |
dirstate: align the dirstate's API to the lower level ones
|
| Fri, 01 Oct 2021 00:00:29 +0200 |
Pierre-Yves David |
dirstate: remove a update_file's special case for `merged` file
|
| Thu, 30 Sep 2021 18:00:39 +0200 |
Pierre-Yves David |
dirstate: remove a update_file's special case for tracked file with p2 data
|
| Mon, 19 Jul 2021 05:45:22 +0200 |
Pierre-Yves David |
mergestate: use `update_file` to handle for `ACTION_EXEC`
|
| Mon, 19 Jul 2021 05:44:57 +0200 |
Pierre-Yves David |
mergestate: use `update_file` to handle for `ACTION_ADD_MODIFIED`
|
| Fri, 16 Jul 2021 22:30:11 +0200 |
Pierre-Yves David |
dirstate: replace `update_parent_file_data` with simpler `update_parent` call
|
| Wed, 07 Jul 2021 23:04:19 +0530 |
Pulkit Goyal |
mergestate: use dirstate.update_file API in recordupdates()
|
| Fri, 07 May 2021 22:06:25 -0400 |
Matt Harbison |
merge with stable
|
| Fri, 30 Apr 2021 16:13:02 -0700 |
Kyle Lippincott |
black: make codebase compatible with black v21.4b2 and v20.8b1
stable
|
