| Wed, 21 Aug 2024 09:48:14 +0200 |
Raphaël Gomès |
mergestate: reduce the number of attribute lookups
|
file |
diff |
annotate
|
| Mon, 16 Sep 2024 15:36:44 +0200 |
Matt Harbison |
typing: add `from __future__ import annotations` to most files
|
file |
diff |
annotate
|
| Thu, 18 Jul 2024 12:36:12 +0200 |
Raphaël Gomès |
black: format the codebase with 23.3.0
|
file |
diff |
annotate
|
| Tue, 23 Jul 2024 10:02:46 +0200 |
Raphaël Gomès |
Backout accidental publication of a large range of revisions
|
file |
diff |
annotate
|
| Thu, 18 Jul 2024 12:36:12 +0200 |
Raphaël Gomès |
black: format the codebase with 23.3.0
|
file |
diff |
annotate
|
| Tue, 19 Jul 2022 12:41:46 +0200 |
Georges Racinet |
mergestate: action name was str
stable
|
file |
diff |
annotate
|
| Tue, 31 May 2022 22:50:01 +0200 |
Manuel Jacob |
py3: catch FileNotFoundError instead of checking errno == ENOENT
|
file |
diff |
annotate
|
| Mon, 21 Feb 2022 13:08:28 -0700 |
Gregory Szorc |
py3: use class X: instead of class X(object):
|
file |
diff |
annotate
|
| Tue, 01 Mar 2022 20:52:32 -0800 |
Gregory Szorc |
py3: replace pycompat.itervalues(x) with x.values()
|
file |
diff |
annotate
|
| Thu, 03 Mar 2022 18:28:30 -0800 |
Gregory Szorc |
global: bulk replace simple pycompat.iteritems(x) with x.items()
|
file |
diff |
annotate
|
| Thu, 03 Mar 2022 17:34:00 +0100 |
Gregory Szorc |
py2: remove simple from __future__ statements
|
file |
diff |
annotate
|
| Mon, 07 Feb 2022 22:54:38 -0800 |
Martin von Zweigbergk |
filemerge: move check for identical sides out of filemerge()
|
file |
diff |
annotate
|
| Mon, 07 Feb 2022 20:12:09 -0800 |
Martin von Zweigbergk |
mergestate: use an early return for trivial merges
|
file |
diff |
annotate
|
| Sun, 30 Jan 2022 06:01:42 +0100 |
Pierre-Yves David |
merge-actions: add some information about the "changes" the action do
|
file |
diff |
annotate
|
| Sat, 29 Jan 2022 06:21:32 +0100 |
Pierre-Yves David |
merge-actions: have an attribute for narrow safetiness
|
file |
diff |
annotate
|
| Fri, 28 Jan 2022 15:19:58 +0100 |
Pierre-Yves David |
merge-actions: add an explicite "no_op" attribute
|
file |
diff |
annotate
|
| Fri, 28 Jan 2022 19:46:37 +0100 |
Pierre-Yves David |
merge-actions: gather all created action into a set
|
file |
diff |
annotate
|
| Fri, 28 Jan 2022 17:08:30 +0100 |
Pierre-Yves David |
merge-actions: make merge action a full featured object
|
file |
diff |
annotate
|
| Fri, 28 Jan 2022 16:25:41 +0100 |
Pierre-Yves David |
convert: use the merge action constant
|
file |
diff |
annotate
|
| Tue, 07 Dec 2021 21:17:18 -0800 |
Martin von Zweigbergk |
filemerge: stop returning always-`True` value
|
file |
diff |
annotate
|
| Fri, 03 Dec 2021 16:21:46 -0800 |
Martin von Zweigbergk |
filemerge: merge `premerge()` into `filemerge()`
|
file |
diff |
annotate
|
| Fri, 03 Dec 2021 15:43:54 -0800 |
Martin von Zweigbergk |
mergestate: inline `_resolve()` into `resolve()`
|
file |
diff |
annotate
|
| Fri, 03 Dec 2021 13:53:02 -0800 |
Martin von Zweigbergk |
mergestate: make `_resolve()` do both preresolve and resolve
|
file |
diff |
annotate
|
| Thu, 02 Dec 2021 22:59:36 -0800 |
Martin von Zweigbergk |
mergestate: merge `preresolve()` into `resolve()`
|
file |
diff |
annotate
|
| Thu, 30 Sep 2021 16:33:12 +0200 |
Pierre-Yves David |
dirstate: align the dirstate's API to the lower level ones
|
file |
diff |
annotate
|
| Fri, 01 Oct 2021 00:00:29 +0200 |
Pierre-Yves David |
dirstate: remove a update_file's special case for `merged` file
|
file |
diff |
annotate
|
| 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
|
file |
diff |
annotate
|
| Mon, 19 Jul 2021 05:45:22 +0200 |
Pierre-Yves David |
mergestate: use `update_file` to handle for `ACTION_EXEC`
|
file |
diff |
annotate
|
| Mon, 19 Jul 2021 05:44:57 +0200 |
Pierre-Yves David |
mergestate: use `update_file` to handle for `ACTION_ADD_MODIFIED`
|
file |
diff |
annotate
|
| Fri, 16 Jul 2021 22:30:11 +0200 |
Pierre-Yves David |
dirstate: replace `update_parent_file_data` with simpler `update_parent` call
|
file |
diff |
annotate
|
| Wed, 07 Jul 2021 23:04:19 +0530 |
Pulkit Goyal |
mergestate: use dirstate.update_file API in recordupdates()
|
file |
diff |
annotate
|
| Fri, 07 May 2021 22:06:25 -0400 |
Matt Harbison |
merge with stable
|
file |
diff |
annotate
|
| Fri, 30 Apr 2021 16:13:02 -0700 |
Kyle Lippincott |
black: make codebase compatible with black v21.4b2 and v20.8b1
stable
|
file |
diff |
annotate
|
| Mon, 29 Mar 2021 01:52:06 +0200 |
Joerg Sonnenberger |
node: replace nullid and friends with nodeconstants class
|
file |
diff |
annotate
|
| Wed, 31 Mar 2021 00:19:52 +0200 |
Joerg Sonnenberger |
mergestate: remove unused import
|
file |
diff |
annotate
|
| Tue, 30 Mar 2021 02:32:30 +0200 |
Joerg Sonnenberger |
refactor: prefer checks against nullrev over nullid
|
file |
diff |
annotate
|
| Wed, 10 Mar 2021 13:08:41 +0530 |
Pulkit Goyal |
mergestate: don't pop stateextras when there are no conflicts on filemerge
|
file |
diff |
annotate
|
| Fri, 27 Nov 2020 17:03:29 -0500 |
Augie Fackler |
formating: upgrade to black 20.8b1
|
file |
diff |
annotate
|
| Sat, 10 Oct 2020 12:43:04 +0530 |
Pulkit Goyal |
mergestate: add `allextras()` to get all extras
|
file |
diff |
annotate
|
| Tue, 06 Oct 2020 19:11:34 +0530 |
Pulkit Goyal |
mergestate: document `o` merge record state in _mergestate_base docs
|
file |
diff |
annotate
|
| Fri, 25 Sep 2020 13:58:05 +0530 |
Pulkit Goyal |
mergestate: update _stateextras instead of reassinging
|
file |
diff |
annotate
|
| Wed, 16 Sep 2020 18:09:32 +0530 |
Pulkit Goyal |
mergestate: define NO_OP_ACTION in module scope instead of inside mergeresult
|
file |
diff |
annotate
|
| Wed, 09 Sep 2020 16:49:19 +0530 |
Pulkit Goyal |
mergestate: introduce a new ACTION_KEEP_NEW
|
file |
diff |
annotate
|
| Thu, 17 Sep 2020 22:34:36 -0700 |
Martin von Zweigbergk |
mergedriver: delete it
|
file |
diff |
annotate
|
| Thu, 17 Sep 2020 23:09:47 -0700 |
Martin von Zweigbergk |
mergestate: move commit() from base class to on-disk subclass
|
file |
diff |
annotate
|
| Thu, 17 Sep 2020 23:12:48 -0700 |
Martin von Zweigbergk |
mergestate: make in-memory mergestate not clear on-disk mergestate on reset()
|
file |
diff |
annotate
|
| Tue, 15 Sep 2020 16:10:16 -0700 |
Martin von Zweigbergk |
merge: use in-memory mergestate when using in-memory context
|
file |
diff |
annotate
|
| Tue, 15 Sep 2020 11:17:24 -0700 |
Martin von Zweigbergk |
mergestate: extract a base class to be shared by future memmergestate
|
file |
diff |
annotate
|
| Tue, 15 Sep 2020 11:33:26 -0700 |
Martin von Zweigbergk |
mergestate: extract overridable methods for making/restoring file backups
|
file |
diff |
annotate
|
| Wed, 16 Sep 2020 13:39:26 -0700 |
Martin von Zweigbergk |
mergestate: initialize all properties in __init__()
|
file |
diff |
annotate
|
| Thu, 17 Sep 2020 19:33:55 -0700 |
Martin von Zweigbergk |
mergestate: remove unnecessary clearing of `localctx` and `otherctx`
|
file |
diff |
annotate
|
| Wed, 16 Sep 2020 13:25:49 -0700 |
Martin von Zweigbergk |
mergestate: move most of of reset() into start()
|
file |
diff |
annotate
|
| Thu, 17 Sep 2020 09:23:21 -0700 |
Martin von Zweigbergk |
mergestate: make clean() only be about creating a clean mergestate
|
file |
diff |
annotate
|
| Wed, 16 Sep 2020 10:09:37 -0700 |
Martin von Zweigbergk |
mergestate: split up reset() for its two use cases
|
file |
diff |
annotate
|
| Tue, 15 Sep 2020 23:19:14 -0700 |
Martin von Zweigbergk |
mergestate: simplify reset(), knowing that `other` and `node` go together
|
file |
diff |
annotate
|
| Tue, 01 Sep 2020 17:08:26 +0530 |
Pulkit Goyal |
merge: add `ACTION_KEEP_ABSENT` to represent files we want to keep absent
|
file |
diff |
annotate
|
| Mon, 10 Aug 2020 15:47:21 +0530 |
Pulkit Goyal |
mergestate: replace `addmergedother()` with generic `addcommitinfo()` (API)
|
file |
diff |
annotate
|
| Mon, 10 Aug 2020 15:29:02 +0530 |
Pulkit Goyal |
mergestate: use _stateextras instead of merge records for commit related info
|
file |
diff |
annotate
|
| Mon, 10 Aug 2020 15:09:44 +0530 |
Pulkit Goyal |
mergestate: use collections.defaultdict(dict) for _stateextras
|
file |
diff |
annotate
|
| Wed, 05 Aug 2020 13:36:50 -0400 |
Augie Fackler |
merge with stable
|
file |
diff |
annotate
|