HomePhabricator

merge with stable

Authored by yuja.

Description

merge with stable

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
d2b5a7659fffyuja
cmdutil: reimplement finddate() without using walkchangerevs() 
Sep 13
65960fe9a769yuja
test-simple-update: add test for -d DATE option 
Sep 13
b0d45612c552yuja
largefiles: walk history in ascending order while downloading all lfiles 
Sep 13
ac7b9ed0a245yuja
largefiles: replace use of walkchangerevs() with simple revset query 
Sep 13
39ddb1121c4eyuja
largefiles: remove unused 'rev' parameter from downloadlfiles() 
Sep 10
dd9e28612468D9018martinvonz
resourceutil: document when we expect to take the importlib.resouces code path 
Sep 12
e53a3d0ef416D9008martinvonz
templater: fix reading of templates in frozen binaries with py3 < 3.7 
Sep 11
47d10ade5bc4D9016martinvonz
histedit: cache description line 
Sep 11
814c7430f828D9017martinvonz
tests: make emacs test less strict 
Sep 11
85b03b1e4715D9007martinvonz
graphlog: use '%' only if there are *unresolved* conflicts 
Sep 10
e7c8a5030a90D8967pulkit
merge: show number of ancestors in bid merge debug notes 
Aug 26
00e4e97c6bc8D8986pulkit
debugmergestate: sort extras before printing 
Sep 3
766797f23f77D8942pulkit
debugmergestate: show extras for files which are not in mergestate 
Aug 24
f6c67bb4ca03pulkit
tests: update lockdelay.py to handle the `wait` argument 
Sep 10
037e88d453faD8984pulkit
commit: pass mergestate into _filecommit() instead of re-reading it 
Sep 3
c6e332a451d0D9009khanchi97
py3: fix bytes and str mixup in run-tests 
Sep 11
3d9f1dfc52c2D8957acezar
hg-core: fix some `clippy` warnings 
Aug 17
a6a000ab135bD8956acezar
rhg: print error message when argument parsing fails 
Aug 17
fbc373b7cbc3D8955acezar
rhg: fix `clippy` warnings 
Aug 13
ed95ccc94333D8954acezar
rhg: pass `ui` to `Command` `run` 
Aug 4
e339693addc0D8873acezar
rhg: add harness tests for rhg files 
Aug 3
1b3197047f5cD8872Alphare
rhg: make output of `files` relative to the current directory and the root 
Jul 30
64de86fd0984D9001pulkit
tags: take lock instead of wlock before writing hgtagsfnodes1 cache 
Sep 8
5523e3e1bc71pulkit
statichttprepo: use LockUnavailable() instead of Abort() for lock (API) 
Sep 10
324ad3e7ef41D9000pulkit
localrepo: warn if we are writing to cache without a lock 
Sep 8
f52b0297acc8D8985pulkit
commit: fix a wrong argument name in documentation 
Sep 3
7a57ced7de87pulkit
git: remove unrequired assignment of listignored and listunknown 
Sep 10
0d7ec06c1cdeD9004durin42
hgdemandimport: bypass demandimport for _ast module (issue6407) 
Sep 9
e47385ef4e17yuja
grep: fix hash(linestate) to not include linenum 
Sep 8
9c8d2cf7f591yuja
test-grep: document that trivially moved lines might not be detected 
Sep 8
9b9071fabcd3yuja
revset: remove indirect indexing of status tuple 
Sep 8
78861610ded8D8951mharbison72
rewriteutil: relax the sha1 hash references to handle future hash types 
Aug 25
1a5d3e555c70D8950mharbison72
phabricator: update the hashes in commit messages as they get submitted 
Aug 24
f7e293e0475fD8949mharbison72
rewriteutil: also consider pending obsoletes when updating hashes in messages 
Aug 24
0a57ef4b3bdbD8948mharbison72
rewriteutil: extract evolve code used to replace obsolete hashes in commits 
Aug 24
d4cf80341589D8999durin42
git: fix index handling of removed files during commit (issue6398) 
Sep 7
601e3658216dD8998durin42
git: make dirstate actually support listclean parameter 
Sep 7
0c6b2cc9a7bbD8997durin42
git: make dirstate status() respect matcher 
Sep 7
c67529569643D8996durin42
git: fix up dirstate use of index 
Sep 7
6739ef7c5fcfD8995durin42
git: correctly handle "nothing changed" commits 
Sep 7
4111954cf86dD8994durin42
localrepo: use functools.wraps() in unfilteredmethod decorator 
Sep 7
c8695439d7e3D8993durin42
git: actually copy treemanifest instances in .copy() (issue6398) 
Sep 7
ec5974500acdyuja
grep: fix hash(linestate) to not include linenum 
Sep 8
038aaad433a7yuja
test-grep: document that trivially moved lines might not be detected 
Sep 8
48965a73ca58yuja
revset: remove indirect indexing of status tuple 
Sep 8
0babbc33baecD8951mharbison72
rewriteutil: relax the sha1 hash references to handle future hash types 
Aug 25
68bfd9e415b5D8950mharbison72
phabricator: update the hashes in commit messages as they get submitted 
Aug 24
b65a3d50aa7bD8949mharbison72
rewriteutil: also consider pending obsoletes when updating hashes in messages 
Aug 24
2b89313a2263D8948mharbison72
rewriteutil: extract evolve code used to replace obsolete hashes in commits 
Aug 24
8e997c5da2f3D8999durin42
git: fix index handling of removed files during commit (issue6398) 
Sep 7