| 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)
|
