| Mon, 03 Aug 2020 14:12:13 +0530 |
Pulkit Goyal |
merge: pass mergeresult obj instead of actions in applyupdates() (API)
|
changeset |
files
|
| Mon, 03 Aug 2020 13:30:14 +0530 |
Pulkit Goyal |
merge: pass mergeresult obj instead of actions in _checkcollision() (API)
|
changeset |
files
|
| Tue, 28 Jul 2020 20:21:06 +0200 |
Pierre-Yves David |
commitctx: directly update the touched and added set of files
|
changeset |
files
|
| Tue, 28 Jul 2020 20:19:09 +0200 |
Pierre-Yves David |
commitctx: directly updated the set of removed files
|
changeset |
files
|
| Wed, 29 Jul 2020 16:48:31 +0200 |
Pierre-Yves David |
commitctx: create the `ChangingFiles` object sooner
|
changeset |
files
|
| Sat, 25 Jul 2020 16:34:02 +0200 |
Pierre-Yves David |
commitctx: move ChangingFiles creation directly inside `_process_files`
|
changeset |
files
|
| Sat, 25 Jul 2020 16:13:32 +0200 |
Pierre-Yves David |
commitctx: create the ChangingFiles object directly in the various case
|
changeset |
files
|
| Sat, 25 Jul 2020 16:13:17 +0200 |
Pierre-Yves David |
commitctx: no longer make the storage and added/removed file optional
|
changeset |
files
|
| Sat, 25 Jul 2020 16:07:38 +0200 |
Pierre-Yves David |
commitctx: directly gather p1 and p2 copies in `files`
|
changeset |
files
|
| Sat, 25 Jul 2020 16:02:26 +0200 |
Pierre-Yves David |
commitctx: extract sidedata encoding inside its own function
|
changeset |
files
|
| Sat, 25 Jul 2020 15:55:09 +0200 |
Pierre-Yves David |
commitctx: directly pass a ChangingFiles object to changelog.add
|
changeset |
files
|
| Sat, 25 Jul 2020 15:49:12 +0200 |
Pierre-Yves David |
commitctx: return a richer object from _prepare_files
|
changeset |
files
|
| Thu, 06 Aug 2020 10:53:00 -0700 |
Martin von Zweigbergk |
templater: teach template loader to use open_template() function
|
changeset |
files
|
| Thu, 06 Aug 2020 10:52:52 -0700 |
Martin von Zweigbergk |
templater: restructure open_template() a little to prepare for relative paths
|
changeset |
files
|
| Thu, 06 Aug 2020 09:50:10 -0700 |
Martin von Zweigbergk |
templater: add exception-raising version of open_template()
|
changeset |
files
|
| Wed, 05 Aug 2020 22:13:51 -0700 |
Martin von Zweigbergk |
templater: replace Py3-only exception types by super-types available in Py2
|
changeset |
files
|
| Wed, 05 Aug 2020 14:19:42 -0700 |
Martin von Zweigbergk |
hgweb: enable reading styles from resources in frozen binaries
|
changeset |
files
|
| Wed, 05 Aug 2020 14:03:45 -0700 |
Martin von Zweigbergk |
hgweb: rely on open_template()'s fallback to using templatedir()
|
changeset |
files
|
| Wed, 05 Aug 2020 14:03:14 -0700 |
Martin von Zweigbergk |
hgweb: open mapfile using templater.open_template()
|
changeset |
files
|
| Wed, 05 Aug 2020 13:58:30 -0700 |
Martin von Zweigbergk |
hgweb: simplify a constant-length list by converting to literal tuple
|
changeset |
files
|
| Wed, 05 Aug 2020 13:33:07 -0700 |
Martin von Zweigbergk |
hgweb: remove some accesses to private member uimod._unset
|
changeset |
files
|
| Thu, 30 Jul 2020 21:36:29 -0700 |
Martin von Zweigbergk |
templater: try to read %include in mapfiles from resources
|
changeset |
files
|
| Thu, 30 Jul 2020 15:29:06 -0700 |
Martin von Zweigbergk |
templater: unroll loop over mapfile directories
|
changeset |
files
|
| Tue, 04 Aug 2020 10:51:25 -0700 |
Martin von Zweigbergk |
templater: make open_template() read from resources if in frozen binary
|
changeset |
files
|
| Tue, 04 Aug 2020 13:22:00 -0700 |
Martin von Zweigbergk |
templater: pass opened file-like object to templatespec
|
changeset |
files
|
| Tue, 04 Aug 2020 13:21:29 -0700 |
Martin von Zweigbergk |
templater: replace templatepath() with function that also opens the file
|
changeset |
files
|
| Thu, 30 Jul 2020 13:44:06 -0700 |
Martin von Zweigbergk |
templater: start passing resource to read from into _readmapfile()
|
changeset |
files
|
| Tue, 04 Aug 2020 09:13:10 -0700 |
Martin von Zweigbergk |
templater: move stylemap() to hgweb_mod, since that's its only user
|
changeset |
files
|
| 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
|