Mercurial > hg

log mercurial/mergestate.py @ 49923:547d6817e0c3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -60 tip
age author description
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
Mon, 29 Mar 2021 01:52:06 +0200 Joerg Sonnenberger node: replace nullid and friends with nodeconstants class
Wed, 31 Mar 2021 00:19:52 +0200 Joerg Sonnenberger mergestate: remove unused import
Tue, 30 Mar 2021 02:32:30 +0200 Joerg Sonnenberger refactor: prefer checks against nullrev over nullid
Wed, 10 Mar 2021 13:08:41 +0530 Pulkit Goyal mergestate: don't pop stateextras when there are no conflicts on filemerge
Fri, 27 Nov 2020 17:03:29 -0500 Augie Fackler formating: upgrade to black 20.8b1
Sat, 10 Oct 2020 12:43:04 +0530 Pulkit Goyal mergestate: add `allextras()` to get all extras
Tue, 06 Oct 2020 19:11:34 +0530 Pulkit Goyal mergestate: document `o` merge record state in _mergestate_base docs
Fri, 25 Sep 2020 13:58:05 +0530 Pulkit Goyal mergestate: update _stateextras instead of reassinging
Wed, 16 Sep 2020 18:09:32 +0530 Pulkit Goyal mergestate: define NO_OP_ACTION in module scope instead of inside mergeresult
Wed, 09 Sep 2020 16:49:19 +0530 Pulkit Goyal mergestate: introduce a new ACTION_KEEP_NEW
Thu, 17 Sep 2020 22:34:36 -0700 Martin von Zweigbergk mergedriver: delete it
Thu, 17 Sep 2020 23:09:47 -0700 Martin von Zweigbergk mergestate: move commit() from base class to on-disk subclass
Thu, 17 Sep 2020 23:12:48 -0700 Martin von Zweigbergk mergestate: make in-memory mergestate not clear on-disk mergestate on reset()
Tue, 15 Sep 2020 16:10:16 -0700 Martin von Zweigbergk merge: use in-memory mergestate when using in-memory context
Tue, 15 Sep 2020 11:17:24 -0700 Martin von Zweigbergk mergestate: extract a base class to be shared by future memmergestate
Tue, 15 Sep 2020 11:33:26 -0700 Martin von Zweigbergk mergestate: extract overridable methods for making/restoring file backups
Wed, 16 Sep 2020 13:39:26 -0700 Martin von Zweigbergk mergestate: initialize all properties in __init__()
Thu, 17 Sep 2020 19:33:55 -0700 Martin von Zweigbergk mergestate: remove unnecessary clearing of `localctx` and `otherctx`
Wed, 16 Sep 2020 13:25:49 -0700 Martin von Zweigbergk mergestate: move most of of reset() into start()
Thu, 17 Sep 2020 09:23:21 -0700 Martin von Zweigbergk mergestate: make clean() only be about creating a clean mergestate
Wed, 16 Sep 2020 10:09:37 -0700 Martin von Zweigbergk mergestate: split up reset() for its two use cases
Tue, 15 Sep 2020 23:19:14 -0700 Martin von Zweigbergk mergestate: simplify reset(), knowing that `other` and `node` go together
Tue, 01 Sep 2020 17:08:26 +0530 Pulkit Goyal merge: add `ACTION_KEEP_ABSENT` to represent files we want to keep absent
Mon, 10 Aug 2020 15:47:21 +0530 Pulkit Goyal mergestate: replace `addmergedother()` with generic `addcommitinfo()` (API)
Mon, 10 Aug 2020 15:29:02 +0530 Pulkit Goyal mergestate: use _stateextras instead of merge records for commit related info
Mon, 10 Aug 2020 15:09:44 +0530 Pulkit Goyal mergestate: use collections.defaultdict(dict) for _stateextras
Wed, 05 Aug 2020 13:36:50 -0400 Augie Fackler merge with stable
Tue, 14 Jul 2020 16:40:28 +0530 Pulkit Goyal merge: remove no longer required ACTION_GET_OTHER_AND_STORE
Sat, 01 Aug 2020 18:39:28 +0530 Pulkit Goyal mergestate: fix BC breakage introduced because of removal of a merge record stable 5.5
Thu, 09 Jul 2020 18:43:38 +0530 Pulkit Goyal mergestate: document what mergestate._results is for
Thu, 09 Jul 2020 18:38:09 +0530 Pulkit Goyal mergestate: rename a helpless variable name to bit helpful one
Thu, 09 Jul 2020 18:20:54 +0530 Pulkit Goyal mergestate: remove unnecessary recordactions() from mergestate class
less more | (0) -60 tip