| Mon, 03 Aug 2020 22:15:45 -0700 |
Martin von Zweigbergk |
hgweb: simplify staticfile() now that we always pass it a single directory
|
changeset |
files
|
| Fri, 31 Jul 2020 10:05:07 -0700 |
Martin von Zweigbergk |
packaging: include templates with their package as key in package_data
|
changeset |
files
|
| Fri, 31 Jul 2020 09:49:52 -0700 |
Martin von Zweigbergk |
packaging: mark mercurial.templates and subdirs as packages
|
changeset |
files
|
| Thu, 12 Dec 2019 12:41:01 -0800 |
Martin von Zweigbergk |
templates: add __init__.py files to templates/ dirs
|
changeset |
files
|
| Wed, 05 Aug 2020 13:36:50 -0400 |
Augie Fackler |
merge with stable
|
changeset |
files
|
| Tue, 21 Jul 2020 18:21:27 +0530 |
Pulkit Goyal |
localrepo: abort creating a shared repo if the source does not have store
|
changeset |
files
|
| Tue, 21 Jul 2020 13:58:58 +0530 |
Pulkit Goyal |
localrepo: only use 'bookmarksinstore' requirement if we have 'store'
|
changeset |
files
|
| Sat, 25 Jul 2020 01:42:41 +0530 |
Pulkit Goyal |
mergeresult: make actionmapping a dict of dict instead of dict of lists
|
changeset |
files
|
| Sat, 25 Jul 2020 14:44:29 +0530 |
Pulkit Goyal |
largefiles: introduce a constant for 'lfmr' action
|
changeset |
files
|
| Sat, 25 Jul 2020 14:41:20 +0530 |
Pulkit Goyal |
largefiles: override merge.emptyactions() to include `lfmr`
|
changeset |
files
|
| Sat, 25 Jul 2020 01:17:35 +0530 |
Pulkit Goyal |
merge: unify logic of couple of if-else's in manifestmerge()
|
changeset |
files
|
| Fri, 24 Jul 2020 23:49:08 +0530 |
Pulkit Goyal |
sparse: add comment for an if condition which I tried to refactor
|
changeset |
files
|
| Fri, 24 Jul 2020 23:40:07 +0530 |
Pulkit Goyal |
mergeactions: use action constants instead of string values
|
changeset |
files
|
| Sun, 02 Aug 2020 10:24:28 -0700 |
Pulkit Goyal |
merge: use the new action based mapping introduced in mergeresult obj
|
changeset |
files
|
| Fri, 24 Jul 2020 19:48:38 +0530 |
Pulkit Goyal |
mergeresult: introduce action -> (filename, data, msg) mapping and related API
|
changeset |
files
|
| Sun, 02 Aug 2020 10:15:55 -0700 |
Pulkit Goyal |
mergeresult: rename _actions to _filemapping
|
changeset |
files
|
| Fri, 24 Jul 2020 19:19:47 +0530 |
Pulkit Goyal |
sparse: pass mergeresult obj in sparse.filterupdatesactions() (API)
|
changeset |
files
|
| Fri, 24 Jul 2020 19:13:20 +0530 |
Pulkit Goyal |
merge: filter actions before calling _resolvetrivial()
|
changeset |
files
|
| Fri, 24 Jul 2020 18:16:29 +0530 |
Pulkit Goyal |
merge: introduce mergeresult.updateactions() and use it
|
changeset |
files
|
| Fri, 24 Jul 2020 17:57:23 +0530 |
Pulkit Goyal |
merge: pass mergeresult instead of actions in _checkunknownfiles() (API)
|
changeset |
files
|
| Fri, 24 Jul 2020 17:52:33 +0530 |
Pulkit Goyal |
merge: pass mergeresult obj instead of actions dict in _resolvetrivial()
|
changeset |
files
|
| Fri, 24 Jul 2020 17:49:13 +0530 |
Pulkit Goyal |
merge: pass mergeresult obj instead of actions in _filternarrowactions()
|
changeset |
files
|
| Fri, 24 Jul 2020 17:31:26 +0530 |
Pulkit Goyal |
merge: pass mergeresult in checkpassconflicts() instead of actions (API)
|
changeset |
files
|
| Fri, 24 Jul 2020 16:23:55 +0530 |
Pulkit Goyal |
merge: add removefile() to mergeresult object
|
changeset |
files
|
| Fri, 24 Jul 2020 16:18:39 +0530 |
Pulkit Goyal |
merge: introduce mergeresult.addfile() and use it
|
changeset |
files
|
| Fri, 24 Jul 2020 15:56:11 +0530 |
Pulkit Goyal |
merge: make mergeresult constructor initialize empty object
|
changeset |
files
|
| Fri, 24 Jul 2020 15:15:20 +0530 |
Pulkit Goyal |
merge: improve documentation of fbid dict used for merge bid
|
changeset |
files
|
| Fri, 24 Jul 2020 14:45:00 +0530 |
Pulkit Goyal |
merge: move conversion of file-key dict to action-key dict in mergeresult
|
changeset |
files
|
| Sun, 02 Aug 2020 10:12:21 -0700 |
Pulkit Goyal |
merge: introduce hasconflicts() on mergeresult object
|
changeset |
files
|
| Tue, 14 Jul 2020 16:40:28 +0530 |
Pulkit Goyal |
merge: remove no longer required ACTION_GET_OTHER_AND_STORE
|
changeset |
files
|
| Tue, 14 Jul 2020 16:31:52 +0530 |
Pulkit Goyal |
merge: pass commitinfo to applyupdates() and get it stored in mergestate
|
changeset |
files
|
| Tue, 14 Jul 2020 16:21:08 +0530 |
Pulkit Goyal |
merge: introduce 'commitinfo' in mergeresult
|
changeset |
files
|