| 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
|
| Thu, 23 Jul 2020 18:03:14 +0530 |
Pulkit Goyal |
merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API)
|
changeset |
files
|
| Thu, 30 Jul 2020 22:49:51 -0700 |
Martin von Zweigbergk |
packaging: delete unnecessary updating of `dirs` list
|
changeset |
files
|
| Sun, 02 Aug 2020 10:08:18 -0700 |
Martin von Zweigbergk |
packaging: make "mercurial.defaultrc" a key in package_data
|
changeset |
files
|
| Thu, 30 Jul 2020 12:22:41 -0700 |
Martin von Zweigbergk |
templatespec: use new factory functions in hooklib
|
changeset |
files
|
| Mon, 20 Jul 2020 22:43:33 -0700 |
Martin von Zweigbergk |
templatespec: use new factory functions in logcmdutil
|
changeset |
files
|
| Mon, 20 Jul 2020 21:33:28 -0700 |
Martin von Zweigbergk |
templatespec: move check for non-unicode to lower-level function
|
changeset |
files
|
| Mon, 20 Jul 2020 21:32:10 -0700 |
Martin von Zweigbergk |
templatespec: logcmdutil.templatespec() gets either template or mapfile
|
changeset |
files
|
| Thu, 16 Jul 2020 13:33:46 -0700 |
Martin von Zweigbergk |
templatespec: create a factory function for each type there is
|
changeset |
files
|
| Wed, 29 Jul 2020 10:42:09 -0700 |
Martin von Zweigbergk |
templater: stop accepting a single style to stylemap()
|
changeset |
files
|
| Thu, 23 Jul 2020 10:20:48 -0700 |
Martin von Zweigbergk |
formatter: inline a variable assigned from `templater.templater.frommapfile`
|
changeset |
files
|
| Wed, 22 Jul 2020 21:23:46 -0700 |
Martin von Zweigbergk |
templater: don't normalize path separators to '/' when interacting with OS
|
changeset |
files
|
| Thu, 23 Jul 2020 22:50:20 -0700 |
Martin von Zweigbergk |
formatter: remove now-unnecessary check for file-ness
|
changeset |
files
|
| Thu, 23 Jul 2020 22:47:55 -0700 |
Martin von Zweigbergk |
templater: make templatepath() not return directory paths
|
changeset |
files
|
| Thu, 23 Jul 2020 22:44:18 -0700 |
Martin von Zweigbergk |
tests: show unusual error message for `hg log --style coal`
|
changeset |
files
|
| Wed, 22 Jul 2020 10:34:24 -0700 |
Martin von Zweigbergk |
config: remove now-unused `abs` argument from `include` callback
|
changeset |
files
|
| Wed, 22 Jul 2020 10:32:28 -0700 |
Martin von Zweigbergk |
config: re-calculate absolute %include path in `include` callback
|
changeset |
files
|
| Wed, 22 Jul 2020 10:25:28 -0700 |
Martin von Zweigbergk |
subrepoutil: use relative path for looking up config `%include`s
|
changeset |
files
|
| Wed, 22 Jul 2020 00:13:02 -0700 |
Martin von Zweigbergk |
config: remove now-unused support for "includepaths"
|
changeset |
files
|
| Sat, 25 Jul 2020 15:37:05 +0200 |
Pierre-Yves David |
commitctx: gather more code dealing with copy-in-extra
|
changeset |
files
|
| Sat, 25 Jul 2020 15:33:45 +0200 |
Pierre-Yves David |
commitctx: rename files to touched in a couple of place
|
changeset |
files
|
| Sat, 25 Jul 2020 15:13:25 +0200 |
Pierre-Yves David |
commitctx: extract copy information encoding into extra into commit.py
|
changeset |
files
|
| Sat, 25 Jul 2020 14:59:55 +0200 |
Pierre-Yves David |
commitctx: create the new extra dict on its own line
|
changeset |
files
|
| Wed, 29 Jul 2020 15:40:13 +0200 |
Pierre-Yves David |
commitctx: explicitly pass `manifest` to _commit_manifest
|
changeset |
files
|
| Thu, 30 Jul 2020 16:58:38 +0100 |
Ian Moody |
phabricator: unconditionally pop `test_vcr` to fix debugcallconduit
|
changeset |
files
|
| Thu, 30 Jul 2020 16:52:12 +0100 |
Ian Moody |
phabricator: demonstrate debugcallconduit being broken without --test-vcr
|
changeset |
files
|
| Tue, 28 Jul 2020 11:11:14 -0700 |
Martin von Zweigbergk |
cleanup: fix bad formatting of state.py from D8811
|
changeset |
files
|
| Thu, 30 Jul 2020 16:13:17 +0200 |
Joerg Sonnenberger |
dirstate: restore original estimation and update comment
|
changeset |
files
|
| Fri, 31 Jul 2020 17:09:31 +0530 |
Pulkit Goyal |
merge stable in default
|
changeset |
files
|
| Thu, 30 Jul 2020 01:10:10 +0200 |
Joerg Sonnenberger |
dirstate: revert change to Rust binding
|
changeset |
files
|
| Thu, 23 Jul 2020 23:52:31 +0200 |
Pierre-Yves David |
commitctx: extract all the file preparation logic in a new function
|
changeset |
files
|
| Thu, 23 Jul 2020 23:58:23 +0200 |
Pierre-Yves David |
commitctx: gather more preparation code within the lock context
|
changeset |
files
|
| Thu, 23 Jul 2020 23:40:59 +0200 |
Pierre-Yves David |
commitctx: move a special case about files earlier
|
changeset |
files
|