| Thu, 30 Jul 2020 21:36:29 -0700 |
Martin von Zweigbergk |
templater: try to read %include in mapfiles from resources
|
| Thu, 30 Jul 2020 15:29:06 -0700 |
Martin von Zweigbergk |
templater: unroll loop over mapfile directories
|
| Tue, 04 Aug 2020 10:51:25 -0700 |
Martin von Zweigbergk |
templater: make open_template() read from resources if in frozen binary
|
| Tue, 04 Aug 2020 13:22:00 -0700 |
Martin von Zweigbergk |
templater: pass opened file-like object to templatespec
|
| Tue, 04 Aug 2020 13:21:29 -0700 |
Martin von Zweigbergk |
templater: replace templatepath() with function that also opens the file
|
| Thu, 30 Jul 2020 13:44:06 -0700 |
Martin von Zweigbergk |
templater: start passing resource to read from into _readmapfile()
|
| Tue, 04 Aug 2020 09:13:10 -0700 |
Martin von Zweigbergk |
templater: move stylemap() to hgweb_mod, since that's its only user
|
| Mon, 03 Aug 2020 22:15:45 -0700 |
Martin von Zweigbergk |
hgweb: simplify staticfile() now that we always pass it a single directory
|
| Fri, 31 Jul 2020 10:05:07 -0700 |
Martin von Zweigbergk |
packaging: include templates with their package as key in package_data
|
| Fri, 31 Jul 2020 09:49:52 -0700 |
Martin von Zweigbergk |
packaging: mark mercurial.templates and subdirs as packages
|
| Thu, 12 Dec 2019 12:41:01 -0800 |
Martin von Zweigbergk |
templates: add __init__.py files to templates/ dirs
|
| Wed, 05 Aug 2020 13:36:50 -0400 |
Augie Fackler |
merge with stable
|
| Tue, 21 Jul 2020 18:21:27 +0530 |
Pulkit Goyal |
localrepo: abort creating a shared repo if the source does not have store
|
| Tue, 21 Jul 2020 13:58:58 +0530 |
Pulkit Goyal |
localrepo: only use 'bookmarksinstore' requirement if we have 'store'
|
| Sat, 25 Jul 2020 01:42:41 +0530 |
Pulkit Goyal |
mergeresult: make actionmapping a dict of dict instead of dict of lists
|
| Sat, 25 Jul 2020 14:44:29 +0530 |
Pulkit Goyal |
largefiles: introduce a constant for 'lfmr' action
|
| Sat, 25 Jul 2020 14:41:20 +0530 |
Pulkit Goyal |
largefiles: override merge.emptyactions() to include `lfmr`
|
| Sat, 25 Jul 2020 01:17:35 +0530 |
Pulkit Goyal |
merge: unify logic of couple of if-else's in manifestmerge()
|
| Fri, 24 Jul 2020 23:49:08 +0530 |
Pulkit Goyal |
sparse: add comment for an if condition which I tried to refactor
|
| Fri, 24 Jul 2020 23:40:07 +0530 |
Pulkit Goyal |
mergeactions: use action constants instead of string values
|
| Sun, 02 Aug 2020 10:24:28 -0700 |
Pulkit Goyal |
merge: use the new action based mapping introduced in mergeresult obj
|
| Fri, 24 Jul 2020 19:48:38 +0530 |
Pulkit Goyal |
mergeresult: introduce action -> (filename, data, msg) mapping and related API
|
| Sun, 02 Aug 2020 10:15:55 -0700 |
Pulkit Goyal |
mergeresult: rename _actions to _filemapping
|
| Fri, 24 Jul 2020 19:19:47 +0530 |
Pulkit Goyal |
sparse: pass mergeresult obj in sparse.filterupdatesactions() (API)
|
| Fri, 24 Jul 2020 19:13:20 +0530 |
Pulkit Goyal |
merge: filter actions before calling _resolvetrivial()
|
| Fri, 24 Jul 2020 18:16:29 +0530 |
Pulkit Goyal |
merge: introduce mergeresult.updateactions() and use it
|
| Fri, 24 Jul 2020 17:57:23 +0530 |
Pulkit Goyal |
merge: pass mergeresult instead of actions in _checkunknownfiles() (API)
|
| Fri, 24 Jul 2020 17:52:33 +0530 |
Pulkit Goyal |
merge: pass mergeresult obj instead of actions dict in _resolvetrivial()
|
| Fri, 24 Jul 2020 17:49:13 +0530 |
Pulkit Goyal |
merge: pass mergeresult obj instead of actions in _filternarrowactions()
|
| Fri, 24 Jul 2020 17:31:26 +0530 |
Pulkit Goyal |
merge: pass mergeresult in checkpassconflicts() instead of actions (API)
|
| Fri, 24 Jul 2020 16:23:55 +0530 |
Pulkit Goyal |
merge: add removefile() to mergeresult object
|
| Fri, 24 Jul 2020 16:18:39 +0530 |
Pulkit Goyal |
merge: introduce mergeresult.addfile() and use it
|
| Fri, 24 Jul 2020 15:56:11 +0530 |
Pulkit Goyal |
merge: make mergeresult constructor initialize empty object
|
| Fri, 24 Jul 2020 15:15:20 +0530 |
Pulkit Goyal |
merge: improve documentation of fbid dict used for merge bid
|
| Fri, 24 Jul 2020 14:45:00 +0530 |
Pulkit Goyal |
merge: move conversion of file-key dict to action-key dict in mergeresult
|
| Sun, 02 Aug 2020 10:12:21 -0700 |
Pulkit Goyal |
merge: introduce hasconflicts() on mergeresult object
|
| Tue, 14 Jul 2020 16:40:28 +0530 |
Pulkit Goyal |
merge: remove no longer required ACTION_GET_OTHER_AND_STORE
|
| Tue, 14 Jul 2020 16:31:52 +0530 |
Pulkit Goyal |
merge: pass commitinfo to applyupdates() and get it stored in mergestate
|
| Tue, 14 Jul 2020 16:21:08 +0530 |
Pulkit Goyal |
merge: introduce 'commitinfo' in mergeresult
|
| Thu, 23 Jul 2020 18:03:14 +0530 |
Pulkit Goyal |
merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API)
|
| Mon, 03 Aug 2020 23:13:58 +0530 |
Pulkit Goyal |
Added signature for changeset 7fc3c5fbc65f
stable
|
| Mon, 03 Aug 2020 23:13:52 +0530 |
Pulkit Goyal |
Added tag 5.5 for changeset 7fc3c5fbc65f
stable
|
| 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
|
| Thu, 30 Jul 2020 22:49:51 -0700 |
Martin von Zweigbergk |
packaging: delete unnecessary updating of `dirs` list
|
| Sun, 02 Aug 2020 10:08:18 -0700 |
Martin von Zweigbergk |
packaging: make "mercurial.defaultrc" a key in package_data
|
| Thu, 30 Jul 2020 12:22:41 -0700 |
Martin von Zweigbergk |
templatespec: use new factory functions in hooklib
|
| Mon, 20 Jul 2020 22:43:33 -0700 |
Martin von Zweigbergk |
templatespec: use new factory functions in logcmdutil
|
| Mon, 20 Jul 2020 21:33:28 -0700 |
Martin von Zweigbergk |
templatespec: move check for non-unicode to lower-level function
|
| Mon, 20 Jul 2020 21:32:10 -0700 |
Martin von Zweigbergk |
templatespec: logcmdutil.templatespec() gets either template or mapfile
|
| Thu, 16 Jul 2020 13:33:46 -0700 |
Martin von Zweigbergk |
templatespec: create a factory function for each type there is
|
| Wed, 29 Jul 2020 10:42:09 -0700 |
Martin von Zweigbergk |
templater: stop accepting a single style to stylemap()
|
| Thu, 23 Jul 2020 10:20:48 -0700 |
Martin von Zweigbergk |
formatter: inline a variable assigned from `templater.templater.frommapfile`
|
| Wed, 22 Jul 2020 21:23:46 -0700 |
Martin von Zweigbergk |
templater: don't normalize path separators to '/' when interacting with OS
|
| Thu, 23 Jul 2020 22:50:20 -0700 |
Martin von Zweigbergk |
formatter: remove now-unnecessary check for file-ness
|
| Thu, 23 Jul 2020 22:47:55 -0700 |
Martin von Zweigbergk |
templater: make templatepath() not return directory paths
|
| Thu, 23 Jul 2020 22:44:18 -0700 |
Martin von Zweigbergk |
tests: show unusual error message for `hg log --style coal`
|
| Wed, 22 Jul 2020 10:34:24 -0700 |
Martin von Zweigbergk |
config: remove now-unused `abs` argument from `include` callback
|
| Wed, 22 Jul 2020 10:32:28 -0700 |
Martin von Zweigbergk |
config: re-calculate absolute %include path in `include` callback
|
| Wed, 22 Jul 2020 10:25:28 -0700 |
Martin von Zweigbergk |
subrepoutil: use relative path for looking up config `%include`s
|
| Wed, 22 Jul 2020 00:13:02 -0700 |
Martin von Zweigbergk |
config: remove now-unused support for "includepaths"
|
| Sat, 25 Jul 2020 22:51:26 +0900 |
Yuya Nishihara |
dispatch: adjust ui.flush() timing to stabilize test-blackbox.t
stable
|
| Sun, 26 Jul 2020 12:46:04 -0700 |
Gregory Szorc |
clonebundles: document REQUIREDRAM key
stable
|
| Sat, 25 Jul 2020 15:37:05 +0200 |
Pierre-Yves David |
commitctx: gather more code dealing with copy-in-extra
|
| Sat, 25 Jul 2020 15:33:45 +0200 |
Pierre-Yves David |
commitctx: rename files to touched in a couple of place
|
| Sat, 25 Jul 2020 15:13:25 +0200 |
Pierre-Yves David |
commitctx: extract copy information encoding into extra into commit.py
|
| Sat, 25 Jul 2020 14:59:55 +0200 |
Pierre-Yves David |
commitctx: create the new extra dict on its own line
|
| Wed, 29 Jul 2020 15:40:13 +0200 |
Pierre-Yves David |
commitctx: explicitly pass `manifest` to _commit_manifest
|
| Thu, 30 Jul 2020 16:58:38 +0100 |
Ian Moody |
phabricator: unconditionally pop `test_vcr` to fix debugcallconduit
|
| Thu, 30 Jul 2020 16:52:12 +0100 |
Ian Moody |
phabricator: demonstrate debugcallconduit being broken without --test-vcr
|
| Tue, 28 Jul 2020 11:11:14 -0700 |
Martin von Zweigbergk |
cleanup: fix bad formatting of state.py from D8811
|
| Thu, 30 Jul 2020 16:13:17 +0200 |
Joerg Sonnenberger |
dirstate: restore original estimation and update comment
|
| Fri, 31 Jul 2020 17:09:31 +0530 |
Pulkit Goyal |
merge stable in default
|
| Thu, 30 Jul 2020 01:10:10 +0200 |
Joerg Sonnenberger |
dirstate: revert change to Rust binding
|
| Tue, 28 Jul 2020 10:19:49 -0700 |
Martin von Zweigbergk |
relnotes: copy "next" to "5.5" and clear "next"
stable
|
| Thu, 23 Jul 2020 23:52:31 +0200 |
Pierre-Yves David |
commitctx: extract all the file preparation logic in a new function
|
| Thu, 23 Jul 2020 23:58:23 +0200 |
Pierre-Yves David |
commitctx: gather more preparation code within the lock context
|
| Thu, 23 Jul 2020 23:40:59 +0200 |
Pierre-Yves David |
commitctx: move a special case about files earlier
|
| Thu, 23 Jul 2020 18:25:45 +0200 |
Pierre-Yves David |
commitctx: extract all the manual logic to process the files
|
| Thu, 23 Jul 2020 23:08:00 +0200 |
Pierre-Yves David |
commitctx: treat `filesadded` more like `filesremoved`
|
| Thu, 23 Jul 2020 22:58:29 +0200 |
Pierre-Yves David |
commitctx: move `writechangesetcopy` business at the end a code section
|
| Thu, 23 Jul 2020 21:09:42 +0200 |
Pierre-Yves David |
commitctx: move copy meta config reading in a dedicated function
|
| Thu, 23 Jul 2020 21:03:30 +0200 |
Pierre-Yves David |
commitctx: no longer use the `writecopiesto` variable in the function
|
| Thu, 23 Jul 2020 14:58:21 +0200 |
Pierre-Yves David |
commitctx: extract the function that commit a new manifest
|
| Fri, 24 Jul 2020 12:52:32 +0200 |
Pierre-Yves David |
commitctx: stop using weakref proxy for transaction
|
| Tue, 28 Jul 2020 20:47:50 +0200 |
Manuel Jacob |
rebase: fix regression in file change detection introduced by 0ecb3b11fcad
stable
|
| Tue, 28 Jul 2020 20:07:05 +0200 |
Manuel Jacob |
context: re-add `overlayworkingctx._compact()` removed in 6a5dcd754842
stable
|
| Thu, 23 Jul 2020 16:30:30 +0200 |
Pierre-Yves David |
push: test for checks preventing publishing obsolete changeset
stable
|
| Thu, 23 Jul 2020 16:29:15 +0200 |
Pierre-Yves David |
push: test for checks preventing publishing obsolete changeset
stable
|
| Thu, 23 Jul 2020 16:26:29 +0200 |
Pierre-Yves David |
push: another test for checks preventing pushing orphaness to a server
stable
|
| Thu, 23 Jul 2020 16:23:43 +0200 |
Pierre-Yves David |
push: test the checks preventing pushing orphaness to a server
stable
|
| Wed, 22 Jul 2020 16:10:33 +0200 |
Pierre-Yves David |
commitctx: document the None return for "touched" value
|
| Thu, 23 Jul 2020 22:06:36 -0700 |
Martin von Zweigbergk |
tests: add tests trying to use dir as style, as %include, and as __base__
|
| Thu, 23 Jul 2020 22:06:31 -0700 |
Martin von Zweigbergk |
tests: fix mistaken copy&paste from commit 4489e9a22763
|
| Mon, 06 Jul 2020 15:10:53 +0200 |
Joerg Sonnenberger |
manifest: kill one more instance of the old merge hash hack
|
| Sat, 25 Jul 2020 04:29:17 +0200 |
Joerg Sonnenberger |
dirstate: isolate node len dependency for the pure version
|
| Fri, 24 Jul 2020 08:38:19 -0700 |
Martin von Zweigbergk |
fix: update documentation to reflect preference for --source over --rev
|
| Fri, 24 Jul 2020 16:32:45 -0700 |
Kyle Lippincott |
tests: make check-py3-compat.py actually load the specified files correctly
|
| Fri, 24 Jul 2020 12:13:10 -0700 |
Kyle Lippincott |
tests: virtualenv is only used on py2, rename and conditionalize
|
| Thu, 23 Jul 2020 13:31:45 -0700 |
Kyle Lippincott |
morestatus: mention --stop even if not using --verbose
|
| Thu, 23 Jul 2020 16:57:56 +0200 |
Pierre-Yves David |
exchange: backout changeset c26335fa4225
stable
|
| Fri, 24 Jul 2020 11:24:59 -0700 |
Martin von Zweigbergk |
templater: handle None returned from templatedir()
|
| Fri, 24 Jul 2020 00:50:57 +0530 |
Pulkit Goyal |
tests: glob 'mercurial.error' in test-phases.t
stable
|
| Thu, 23 Jul 2020 17:32:09 +0200 |
Pierre-Yves David |
infinitepush: remove unused import to tempfile
stable
|
| Wed, 22 Jul 2020 00:09:17 -0700 |
Martin von Zweigbergk |
templater: do search for include of unqualified builtin outside of config code
|
| Tue, 21 Jul 2020 21:59:12 -0700 |
Martin von Zweigbergk |
templater: switch to lower-level config.parse() in _readmapfile()
|
| Tue, 21 Jul 2020 23:50:42 -0700 |
Martin von Zweigbergk |
config: pass both relative and absolute paths to `include` callback
|
| Wed, 22 Jul 2020 22:38:42 -0700 |
Martin von Zweigbergk |
tests: add test for bad template %include and __base__
|
| Tue, 21 Jul 2020 22:52:22 -0700 |
Martin von Zweigbergk |
tests: add test for unqualified include of a built-in template map
|
| Wed, 22 Jul 2020 22:09:38 -0400 |
Augie Fackler |
merge with stable
|
| Tue, 07 Jul 2020 00:18:15 +0200 |
Pierre-Yves David |
commitctx: extract _filecommit too
|
| Mon, 06 Jul 2020 23:14:52 +0200 |
Pierre-Yves David |
commitctx: extract the function in a dedicated module
|
| Mon, 06 Jul 2020 19:13:19 +0200 |
Pierre-Yves David |
commitctx: document a fast path in _filecommit
|
| Tue, 21 Jul 2020 13:36:48 -0700 |
Martin von Zweigbergk |
hgweb: simplify now that we always have a single path
|
| Tue, 21 Jul 2020 13:41:26 -0700 |
Martin von Zweigbergk |
templater: simplify stylemap() now that templatedir() returns a single path
|
| Tue, 21 Jul 2020 13:11:49 -0700 |
Martin von Zweigbergk |
templater: make templatepaths() return a single path, or None
|
| Tue, 21 Jul 2020 13:05:37 -0700 |
Martin von Zweigbergk |
templater: simplify templatepaths() to avoid iterating a singleton list
|
| Mon, 06 Jul 2020 22:46:49 +0200 |
Pierre-Yves David |
commitctx: move a tiny else clause above the very long one
|
| Mon, 06 Jul 2020 22:37:53 +0200 |
Pierre-Yves David |
commitctx: consider removed as touched
|
| Mon, 06 Jul 2020 22:35:34 +0200 |
Pierre-Yves David |
commitctx: rename "changed" to touched
|
| Tue, 07 Jul 2020 11:16:28 +0200 |
Pierre-Yves David |
commitctx: more filesremoved assignment closer to removed computation
|
