| Thu, 18 Mar 2021 18:24:59 -0400 |
Matt Harbison |
merge with stable
|
file |
diff |
annotate
|
| Thu, 11 Mar 2021 18:33:39 -0500 |
Matt Harbison |
merge: force an exception message to bytes before printing as a warning
stable
|
file |
diff |
annotate
|
| Fri, 29 Jan 2021 15:56:08 -0800 |
Martin von Zweigbergk |
errors: use StateError more in merge module
|
file |
diff |
annotate
|
| Mon, 18 Jan 2021 10:24:11 +0100 |
Pierre-Yves David |
purge: also deal with directory with --confirm
|
file |
diff |
annotate
|
| Mon, 18 Jan 2021 10:24:03 +0100 |
Pierre-Yves David |
purge: add a --confirm option
|
file |
diff |
annotate
|
| Mon, 18 May 2020 17:29:53 -0400 |
Augie Fackler |
cleanup: use mergestate.unresolvedcount() instead of bool(list(unresolved()))
|
file |
diff |
annotate
|
| Fri, 27 Nov 2020 17:03:29 -0500 |
Augie Fackler |
formating: upgrade to black 20.8b1
|
file |
diff |
annotate
|
| Fri, 27 Nov 2020 16:59:14 -0500 |
Augie Fackler |
merge: remove spurious ' and trailing whitespace from triple-quoted string
|
file |
diff |
annotate
|
| Mon, 23 Nov 2020 23:08:58 -0800 |
Martin von Zweigbergk |
errors: raise StateError on uncommitted changes when merge starts
|
file |
diff |
annotate
|
| Mon, 22 Jun 2020 22:47:43 -0700 |
Martin von Zweigbergk |
copies: handle more cases where a file got replaced by a copy
|
file |
diff |
annotate
|
| Fri, 09 Oct 2020 09:17:47 -0700 |
Martin von Zweigbergk |
py3: convert an exception message to bytes
|
file |
diff |
annotate
|
| Mon, 14 Sep 2020 23:46:38 +0200 |
Pierre-Yves David |
salvaged: track removal-candidates in more cases
|
file |
diff |
annotate
|
| Fri, 02 Oct 2020 18:40:39 +0530 |
Pulkit Goyal |
merge: check for conflicting actions irrespective of length of bids
|
file |
diff |
annotate
|
| Wed, 30 Sep 2020 18:07:21 +0530 |
Pulkit Goyal |
merge: if CHANGED_DELETED and KEEP_NEW are actions, choose CHANGED_DELETED
|
file |
diff |
annotate
|
| Wed, 30 Sep 2020 15:46:54 +0530 |
Pulkit Goyal |
merge: if DELETED_CHANGED and GET are in actions, choose DELETED_CHANGED
|
file |
diff |
annotate
|
| Mon, 24 Aug 2020 15:35:34 +0530 |
Pulkit Goyal |
merge: store cases when a file is absent post merge in commitinfo
|
file |
diff |
annotate
|
| Thu, 03 Sep 2020 13:44:06 +0530 |
Pulkit Goyal |
merge: store commitinfo if these is a dc or cd conflict
|
file |
diff |
annotate
|
| Mon, 14 Sep 2020 14:40:12 +0530 |
Pulkit Goyal |
merge: disable `m2-vs-ma` optimization if new filenode config is true
|
file |
diff |
annotate
|
| Mon, 21 Sep 2020 09:57:29 -0700 |
Martin von Zweigbergk |
merge: add a higher-level update() for the common `hg update` use case
|
file |
diff |
annotate
|
| Mon, 21 Sep 2020 11:12:58 -0700 |
Martin von Zweigbergk |
merge: make low-level update() private (API)
|
file |
diff |
annotate
|
| Mon, 21 Sep 2020 09:56:48 -0700 |
Martin von Zweigbergk |
merge: add a back_out() function to encapsulate update()
|
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
|
| Tue, 15 Sep 2020 16:10:16 -0700 |
Martin von Zweigbergk |
merge: use in-memory mergestate when using in-memory context
|
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
|
| Thu, 03 Sep 2020 13:25:29 +0530 |
Pulkit Goyal |
merge: move initial handling of mergeactions near to later one
|
file |
diff |
annotate
|
| Wed, 26 Aug 2020 16:37:23 +0530 |
Pulkit Goyal |
merge: update commitinfo from all mergeresults during bid merge
|
file |
diff |
annotate
|
| Mon, 24 Aug 2020 17:22:28 +0530 |
Pulkit Goyal |
merge: add missing ACTION_KEEP when both remote and ancestor are not present
|
file |
diff |
annotate
|
| Mon, 24 Aug 2020 15:20:09 +0530 |
Pulkit Goyal |
merge: store ACTION_KEEP_ABSENT when we are keeping the file absent locally
|
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, 14 Sep 2020 13:51:39 +0530 |
Pulkit Goyal |
mergeresult: introduce dedicated tuple for no-op actions
|
file |
diff |
annotate
|
| Mon, 14 Sep 2020 11:32:24 -0400 |
Valentin Gatien-Baron |
fsmonitor: increase the threshold before we recommend it, when using rust
|
file |
diff |
annotate
|
| Wed, 26 Aug 2020 17:20:53 +0530 |
Pulkit Goyal |
merge: show list of bids for each file in bid-merge in ui.debug()
|
file |
diff |
annotate
|
| Wed, 26 Aug 2020 17:24:22 +0530 |
Pulkit Goyal |
merge: show number of ancestors in bid merge debug notes
|
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:38:45 +0530 |
Pulkit Goyal |
merge: introduce `addcommitinfo()` on mergeresult object
|
file |
diff |
annotate
|
| Mon, 10 Aug 2020 15:34:27 +0530 |
Pulkit Goyal |
merge: use collections.defaultdict() for mergeresult.commitinfo
|
file |
diff |
annotate
|
| Thu, 06 Aug 2020 13:51:43 +0530 |
Pulkit Goyal |
merge: drop commitinfo argument to applyupdates (API)
|
file |
diff |
annotate
|
| Thu, 06 Aug 2020 13:27:38 +0530 |
Pulkit Goyal |
merge: remove emptyactions() and use collections.defaultdict(list) instead
|
file |
diff |
annotate
|
| Wed, 05 Aug 2020 16:52:51 +0530 |
Pulkit Goyal |
merge: pass mergeresult obj in _forgetremoved() (API)
|
file |
diff |
annotate
|
| Wed, 05 Aug 2020 16:00:25 +0530 |
Pulkit Goyal |
mergeresult: introduce filemap() which yields filename based mapping
|
file |
diff |
annotate
|
| Wed, 05 Aug 2020 15:41:23 +0530 |
Pulkit Goyal |
mergeresult: add `files()` and use it
|
file |
diff |
annotate
|
| Wed, 05 Aug 2020 15:37:26 +0530 |
Pulkit Goyal |
mergeresult: introduce getfile() and use it where required
|
file |
diff |
annotate
|
| Wed, 05 Aug 2020 14:03:59 +0530 |
Pulkit Goyal |
merge: use ACTION_* constants instead of values in _filternarrowactions()
|
file |
diff |
annotate
|
| Wed, 05 Aug 2020 13:50:49 +0530 |
Pulkit Goyal |
merge: rework iteration over mergeresult object in checkpathconflicts()
|
file |
diff |
annotate
|
| Wed, 05 Aug 2020 13:21:06 +0530 |
Pulkit Goyal |
applyupdates: simplfy calculation of number of updated files
|
file |
diff |
annotate
|
| Mon, 03 Aug 2020 18:08:37 +0530 |
Pulkit Goyal |
mergeresult: yield from getactions() instead of buidling a list and returning
|
file |
diff |
annotate
|
| Mon, 03 Aug 2020 17:58:18 +0530 |
Pulkit Goyal |
mergeresult: implement a len() function and use it
|
file |
diff |
annotate
|
| Mon, 03 Aug 2020 17:32:30 +0530 |
Pulkit Goyal |
merge: replace use of actions dict with mergeresult object
|
file |
diff |
annotate
|
| Mon, 03 Aug 2020 14:54:45 +0530 |
Pulkit Goyal |
mergeresult: add sort argument to getactions() method
|
file |
diff |
annotate
|
| Mon, 03 Aug 2020 14:19:06 +0530 |
Pulkit Goyal |
merge: pass mergeresult obj in merge._prefetchfiles()
|
file |
diff |
annotate
|
| Mon, 03 Aug 2020 14:12:13 +0530 |
Pulkit Goyal |
merge: pass mergeresult obj instead of actions in applyupdates() (API)
|
file |
diff |
annotate
|
| Mon, 03 Aug 2020 13:30:14 +0530 |
Pulkit Goyal |
merge: pass mergeresult obj instead of actions in _checkcollision() (API)
|
file |
diff |
annotate
|
| Sat, 25 Jul 2020 01:42:41 +0530 |
Pulkit Goyal |
mergeresult: make actionmapping a dict of dict instead of dict of lists
|
file |
diff |
annotate
|
| Sat, 25 Jul 2020 01:17:35 +0530 |
Pulkit Goyal |
merge: unify logic of couple of if-else's in manifestmerge()
|
file |
diff |
annotate
|
| Sun, 02 Aug 2020 10:24:28 -0700 |
Pulkit Goyal |
merge: use the new action based mapping introduced in mergeresult obj
|
file |
diff |
annotate
|
| Fri, 24 Jul 2020 19:48:38 +0530 |
Pulkit Goyal |
mergeresult: introduce action -> (filename, data, msg) mapping and related API
|
file |
diff |
annotate
|
| Sun, 02 Aug 2020 10:15:55 -0700 |
Pulkit Goyal |
mergeresult: rename _actions to _filemapping
|
file |
diff |
annotate
|
| Fri, 24 Jul 2020 19:19:47 +0530 |
Pulkit Goyal |
sparse: pass mergeresult obj in sparse.filterupdatesactions() (API)
|
file |
diff |
annotate
|