HomePhabricator

merge with stable

Authored by durin42.

Description

merge with stable

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
c0e30c9ee5baD6296Kwan
phabricator: set local:commits time metadata as an int, not a string 
Apr 22
289d82a070e9D6295Kwan
phabricator: use templatefilters.json in writediffproperties 
Apr 22
90d48c1c6224D6294indygreg
commands: use byteskwargs() in verify() 
Apr 21
fd384911f51bD6293indygreg
match: use raw strings to avoid illegal baskslash escape 
Apr 21
ececa45c80d8D6292pulkit
revbranchcache: use context manager in _writerevs() to write to file 
Apr 19
09fd338522faD6291pulkit
revbranchcache: factor logic to write names and revs in separate functions 
Apr 19
802ae9772cedD6279martinvonz
tests: make log style a little easier to read in test-copytrace-heuristics.t 
Apr 19
fad480dad04dD6280martinvonz
tests: avoid cryptic nodeids in tests/test-rename-merge1.t 
Apr 19
1afd9d1e55caD6278martinvonz
tests: defines aliases for `hg log` calls in test-copytrace-heuristics.t 
Apr 19
1b0be75cb61fD6233gracinet
rust-discovery: implementing and exposing stats() 
Mar 14
13b64247f48fD6232gracinet
rust-discovery: cpython bindings for the core logic 
Feb 20
10b465d61556D6231gracinet
rust-discovery: starting core implementation 
Feb 19
be0733552984D6230gracinet
rust-dagops: roots 
Feb 20
3bdb21bbf791D6229gracinet
rust-dagops: range of revisions 
Feb 19
84bd6ae2d1f6D6265martinvonz
narrow: also warn when not deleting untracked or ignored files 
Apr 17
6631f3e89b6fD6263joerg.sonnenberger
setdiscovery: fix a few typos 
Apr 17
a68036b849b0D6251martinvonz
copies: delete debug message about "unmatched files new in both" 
Apr 15
341bddf88ac5D6250martinvonz
copies: delete debug message about changes since common ancestor 
Apr 13
91a0bc50b288D6249martinvonz
copies: delete debug message about search limit 
Apr 12
aa8f83923aefD6265martinvonz
narrow: also warn when not deleting untracked or ignored files 
Apr 17
644eaffab9dbD6263joerg.sonnenberger
setdiscovery: fix a few typos 
Apr 17
1e266bd9f25bD6251martinvonz
copies: delete debug message about "unmatched files new in both" 
Apr 15
43c2a13b56ebD6250martinvonz
copies: delete debug message about changes since common ancestor 
Apr 13
380f59da7aeaD6249martinvonz
copies: delete debug message about search limit 
Apr 12
85f5934016f9D6248martinvonz
copies: move early return for "no copies" case a little earlier 
Apr 16
22c9ffdf8ef6D6247martinvonz
copies: fix up "fullcopy" with missing entries from "diverge" 
Apr 15
96bd75e67a94D6246martinvonz
copies: fix up "fullcopy" with missing entries from "copy" 
Apr 15
beec7fc6adecD6245martinvonz
merge: remove workaround for issue5020 
Apr 14
31abb9d713afD6244martinvonz
copies: don't include copies that are not in source in directory move 
Apr 13
7815cf0ea88bD6242martinvonz
tests: add test for issue5343 (grafting with copies) 
Apr 13
9e40c5892714JordiGH
chistedit: use context manager to set verbose ui 
Apr 16
4f9a89837f07marmoute
setdiscovery: stop limiting the number of local head we initially send 
Apr 16
69921d02daafmarmoute
peer: introduce a limitedarguments attributes 
Apr 17
7755b89cadafmarmoute
verify: also check full manifest validity during verify runs 
Mar 6
496ac8a02380marmoute
verify: introduce an experimental --full flag 
Apr 16
57539e5ea2e0marmoute
verify: introduce a notion of "level" 
Apr 16
f2fe7cf4ebb6D6243martinvonz
tests: split out separate test for issue5020 
Apr 14
351cbda889dbD6254martinvonz
tests: avoid a rename/delete conflict when updating in test-narrow-update.t 
Apr 15
344066b54a7bD6253martinvonz
tests: delete unused function in test-rename-merge2.t 
Apr 15
7116fc614cfcD6252martinvonz
tests: make merge conflicts explicit in `hg annotate` tests 
Apr 14
770f5f586ae5D6264martinvonz
narrow: make warning about possibly dirty files respect ui.relative-paths 
Apr 17
6b94f8249eafD6182joerg.sonnenberger
bundle2: handle compression in _forwardchunks 
Apr 2
c2165551eed6D6186martinvonz
changelog: parse copy metadata if available in extras 
Dec 28 2017
36d70c14ed25D6183martinvonz
copies: add config option for writing copy metadata to file and/or changset 
Dec 27 2017
0cfd1f9fb02bD6186martinvonz
changelog: parse copy metadata if available in extras 
Dec 28 2017
0fdf45cb3dc6D6183martinvonz
copies: add config option for writing copy metadata to file and/or changset 
Dec 27 2017
69b4426d288bD6258durin42
packaging: coerce paths to strings 
Apr 16
9d5692d64e18marmoute
revsetbenchmark: add some simpler revset for heads and roots 
Apr 4
eebf78724d94marmoute
repoview: flag `server.view` as experimental 
Apr 12
890f450f848fmarmoute
repoview: move subsettable in a dedicated module 
Apr 12