Mercurial > hg
graph
-
merge with stableWed, 05 Aug 2020 13:36:50 -0400, by Augie Fackler
-
localrepo: abort creating a shared repo if the source does not have storeTue, 21 Jul 2020 18:21:27 +0530, by Pulkit Goyal
-
localrepo: only use 'bookmarksinstore' requirement if we have 'store'Tue, 21 Jul 2020 13:58:58 +0530, by Pulkit Goyal
-
mergeresult: make actionmapping a dict of dict instead of dict of listsSat, 25 Jul 2020 01:42:41 +0530, by Pulkit Goyal
-
largefiles: introduce a constant for 'lfmr' actionSat, 25 Jul 2020 14:44:29 +0530, by Pulkit Goyal
-
largefiles: override merge.emptyactions() to include `lfmr`Sat, 25 Jul 2020 14:41:20 +0530, by Pulkit Goyal
-
merge: unify logic of couple of if-else's in manifestmerge()Sat, 25 Jul 2020 01:17:35 +0530, by Pulkit Goyal
-
sparse: add comment for an if condition which I tried to refactorFri, 24 Jul 2020 23:49:08 +0530, by Pulkit Goyal
-
mergeactions: use action constants instead of string valuesFri, 24 Jul 2020 23:40:07 +0530, by Pulkit Goyal
-
merge: use the new action based mapping introduced in mergeresult objSun, 02 Aug 2020 10:24:28 -0700, by Pulkit Goyal
-
mergeresult: introduce action -> (filename, data, msg) mapping and related APIFri, 24 Jul 2020 19:48:38 +0530, by Pulkit Goyal
-
mergeresult: rename _actions to _filemappingSun, 02 Aug 2020 10:15:55 -0700, by Pulkit Goyal
-
sparse: pass mergeresult obj in sparse.filterupdatesactions() (API)Fri, 24 Jul 2020 19:19:47 +0530, by Pulkit Goyal
-
merge: filter actions before calling _resolvetrivial()Fri, 24 Jul 2020 19:13:20 +0530, by Pulkit Goyal
-
merge: introduce mergeresult.updateactions() and use itFri, 24 Jul 2020 18:16:29 +0530, by Pulkit Goyal
-
merge: pass mergeresult instead of actions in _checkunknownfiles() (API)Fri, 24 Jul 2020 17:57:23 +0530, by Pulkit Goyal
-
merge: pass mergeresult obj instead of actions dict in _resolvetrivial()Fri, 24 Jul 2020 17:52:33 +0530, by Pulkit Goyal
-
merge: pass mergeresult obj instead of actions in _filternarrowactions()Fri, 24 Jul 2020 17:49:13 +0530, by Pulkit Goyal
-
merge: pass mergeresult in checkpassconflicts() instead of actions (API)Fri, 24 Jul 2020 17:31:26 +0530, by Pulkit Goyal
-
merge: add removefile() to mergeresult objectFri, 24 Jul 2020 16:23:55 +0530, by Pulkit Goyal
-
merge: introduce mergeresult.addfile() and use itFri, 24 Jul 2020 16:18:39 +0530, by Pulkit Goyal
-
merge: make mergeresult constructor initialize empty objectFri, 24 Jul 2020 15:56:11 +0530, by Pulkit Goyal
-
merge: improve documentation of fbid dict used for merge bidFri, 24 Jul 2020 15:15:20 +0530, by Pulkit Goyal
-
merge: move conversion of file-key dict to action-key dict in mergeresultFri, 24 Jul 2020 14:45:00 +0530, by Pulkit Goyal
-
merge: introduce hasconflicts() on mergeresult objectSun, 02 Aug 2020 10:12:21 -0700, by Pulkit Goyal
-
merge: remove no longer required ACTION_GET_OTHER_AND_STORETue, 14 Jul 2020 16:40:28 +0530, by Pulkit Goyal
-
merge: pass commitinfo to applyupdates() and get it stored in mergestateTue, 14 Jul 2020 16:31:52 +0530, by Pulkit Goyal
-
merge: introduce 'commitinfo' in mergeresultTue, 14 Jul 2020 16:21:08 +0530, by Pulkit Goyal
-
merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API)Thu, 23 Jul 2020 18:03:14 +0530, by Pulkit Goyal