| 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
|
| Tue, 14 Jul 2020 16:40:28 +0530 |
Pulkit Goyal |
merge: remove no longer required ACTION_GET_OTHER_AND_STORE
|
file |
diff |
annotate
|
| 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
|
file |
diff |
annotate
|
| Thu, 09 Jul 2020 18:43:38 +0530 |
Pulkit Goyal |
mergestate: document what mergestate._results is for
|
file |
diff |
annotate
|
| Thu, 09 Jul 2020 18:38:09 +0530 |
Pulkit Goyal |
mergestate: rename a helpless variable name to bit helpful one
|
file |
diff |
annotate
|
| Thu, 09 Jul 2020 18:20:54 +0530 |
Pulkit Goyal |
mergestate: remove unnecessary recordactions() from mergestate class
|
file |
diff |
annotate
|
| Thu, 09 Jul 2020 17:05:41 +0530 |
Pulkit Goyal |
mergestate: document mergestate records in an organized way
|
file |
diff |
annotate
|
| Thu, 09 Jul 2020 16:39:42 +0530 |
Pulkit Goyal |
mergestate: remove unused unsupported related mergestate records
|
file |
diff |
annotate
|
| Thu, 09 Jul 2020 16:38:24 +0530 |
Pulkit Goyal |
mergestate: add comments about couple of record types and minor reorder
|
file |
diff |
annotate
|
| Thu, 09 Jul 2020 15:50:02 +0530 |
Pulkit Goyal |
mergestate: remove unrequired RECORD_RESOLVED_OTHER record
|
file |
diff |
annotate
|
| Thu, 09 Jul 2020 14:44:58 +0530 |
Pulkit Goyal |
mergestate: rename addpath() -> addpathonflict() to prevent confusion
|
file |
diff |
annotate
|
| Fri, 05 Jun 2020 11:10:33 -0700 |
Martin von Zweigbergk |
merge: move an inspection of the dirstate from record to calculate phase
|
file |
diff |
annotate
|
| Thu, 28 May 2020 16:17:28 -0400 |
Augie Fackler |
mergestate: move staticmethod _filectxorabsent to module level
|
file |
diff |
annotate
|
| Mon, 18 May 2020 14:59:59 -0400 |
Augie Fackler |
mergestate: split out merge state handling code from main merge module
|
file |
diff |
annotate
| base
|