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
e2e507573c7cD6447pulkit
py3: fix test-narrow* which started failing because of recent changes 
May 25
7a64ad3f325dD6368martinvonz
tests: add test for {file_mods}, {file_adds}, {file_dels} on merge commit 
May 11
65fa61ca20afD6367martinvonz
context: add ctx.files{modified,added,removed}() methods 
Apr 18
f3d06d37e194D6418martinvonz
copies: split up _chain() in naive chaining and filtering steps 
May 9
ba6ca4e80607D6446martinvonz
relnotes: document changed behavior of ui.origbackuppath pointing to file 
May 24
b47e9712000bD6370martinvonz
templatekw: move showfileadds() close to showfile{mods,dels}() 
May 11
c2d10506725cD6443pulkit
py3: use range() instead of xrange() 
May 24
343b3ed35cb8D6445pulkit
narrow: move heads close to common as they are closely related 
May 24
f66628c15e6fD6444pulkit
narrow: pass binary nodeids to generateellipsesbundle2() 
May 24
96fc696a9cb2marmoute
match: stabilize _rootsdirsandparents doctest 
May 24
21e77ede77abD6435pulkit
narrow: factor out logic to build ellipses related b2parts in separate fn 
May 20
92f584065b4fD6434pulkit
narrow: remove unrequired compat code for old versions of hg 
May 20
a09829e14fc0marmoute
perf: make sure to explicitly disable any profiler after the first iteration 
May 23
b02f3aa2fab5D6439hooper
test: add missing 'cd ..' to test case 
May 22
52beb1b8a649D6433martinvonz
match: remove an obsolete comment about util.finddirs() 
May 22
c4b8f8637d7aD6432martinvonz
match: de-flake test-doctest.py by not depending on util.dirs() order 
May 22
3293086ff663marmoute
perf: add an option to profile the benchmark section 
May 21
563cd9a72682marmoute
perf: add a `pre-run` option 
May 21
45c18f7345c1D6414hooper
narrow: consider empty commits to be "inside the narrow spec" for templates 
May 20
5b795108dd17D6415gracinet
rust-python3: useless python2 specific import 
May 21
48df8a06c8bbD6397gracinet
rust-python3: compatibility fix for incoming PyLong 
May 16
9166935da31fD6412pulkit
py3: add one new passing test found by buildbot 
May 20
dbd0fcca6dfcmarmoute
discovery: slowly increase sampling size 
May 21
f22131315791Juan Francisco Cantero Hurtado
tests: make the grep pattern in remotefilelog-gcrepack portable (issue6122) 
May 21
1bc7d4cb4182D6413martinvonz
help: document new "bookmarksinstore" requirement in internals.requirements 
May 20
86f17fc31aa8D6411durin42
absorb: fix interactive mode I didn't know existed 
May 20
e0ac310bd033D6410durin42
tests: work around libressl being different about error strings (issue6122) 
May 17
ffab9eed3921durin42
merge with stable 
May 20
de65ae32b82dyuja
templatekw: change default value of 'requires' to () 
May 19
6310180662f5D6390martinvonz
commit: move sorting of added and removed files list to lower level 
May 14
38d85ec06552D6406martinvonz
match: drop unnecessary adding of '' to set of dirs 
Apr 24
7d4ee14ff92dD6405martinvonz
narrowcommands: drop unnecessary adding of '' for root directory 
Apr 23
c361db7a5f14D6404martinvonz
copies: remove hack for adding root dir to util.dirs object 
Apr 18
d8e55c0c642cD6403martinvonz
util: make util.dirs() and util.finddirs() include root directory (API) 
May 16 2017
448486e12c13D6402martinvonz
dirstate: drop workaround for '.' matching root directory 
Jul 14 2017
27d6956d386bD6401martinvonz
match: use '' instead of '.' for root directory (API) 
May 15 2017
7ada598941d2D6400martinvonz
dirstate: move special handling of files==['.'] together 
Apr 24
c0e1ea0c4ceeD6409martinvonz
convert: don't include file in "files" list if it's added in p2 
May 17
78530404d00bD6408martinvonz
convert: demonstrate broken {files} list in merge commits with file flags 
May 17
832c59d1196emharbison72
templater: drop support for old style keywords (API) 
May 18
fa4b13e81f60mharbison72
commands: drop support for legacy ^cmd registration (API) 
May 18
38b7b45627a2mharbison72
extensions: drop support for extsetup() without `ui` argument (API) 
May 18
bcb1a2b6cd00D6407martinvonz
relnotes: mention removed support for mixed log graph lines 
May 17
da3861ef7959D6399durin42
tests: fix test-clonebundles on recent openbsd 
May 17
163b8fd7bb72D6396gracinet
rust-python3: compatibility fix for integer conversion 
May 16
d6c1dd936778D6398durin42
rust: sort dependencies entries in Cargo.toml 
May 17
f887a8c1abdeD6396gracinet
rust-python3: compatibility fix for integer conversion 
May 16
0a6209c9fcf5D6398durin42
rust: sort dependencies entries in Cargo.toml 
May 17
5364ba1f796fD6391pulkit
py3: make contrib/testparseutil.py to work on str(unicodes) 
May 16
c7652f7440d9D6273Alphare
rust-filepatterns: call new Rust implementations from Python 
May 17