Page MenuHomePhabricator
Feed Advanced Search

Aug 22 2020

D8920: mergestate: use _stateextras instead of merge records for commit related info is now accepted and ready to land.
Aug 22 2020, 6:43 PM
D8919: mergestate: use collections.defaultdict(dict) for _stateextras is now accepted and ready to land.
Aug 22 2020, 6:41 PM
D8936: hgweb: minimize scope of a try-block in staticfile() is now accepted and ready to land.
Aug 22 2020, 6:39 PM
D8935: hgweb: ignore web.templates config when guessing mime type for static content is now accepted and ready to land.
Aug 22 2020, 6:38 PM
D8934: hgweb: let staticfile() look up path from default location unless provided is now accepted and ready to land.
Aug 22 2020, 6:38 PM
D8933: hgweb: handle None from templatedir() equally bad in webcommands.py is now accepted and ready to land.
Aug 22 2020, 6:37 PM

Aug 10 2020

indygreg added inline comments to D8919: mergestate: use collections.defaultdict(dict) for _stateextras.
Aug 10 2020, 9:06 PM
D8924: requirements: introduce a set of working directory specific requirements is now accepted and ready to land.
Aug 10 2020, 9:00 PM
D8918: localrepo: move requirements constant to requirements module is now accepted and ready to land.
Aug 10 2020, 8:59 PM
D8917: requirements: introduce new requirements related module is now accepted and ready to land.
Aug 10 2020, 8:58 PM
D8916: repository: introduce constant for treemanifest requirement and use it is now accepted and ready to land.
Aug 10 2020, 8:53 PM

Aug 8 2020

D8859: keepalive: Do not append _rbuf if _raw_readinto exists (issue6356) is now accepted and ready to land.

Good work tracking down this obscure failure!

Aug 8 2020, 5:01 PM
indygreg closed D7221: hghave: fix bytes/string issue on Python 3.
Aug 8 2020, 4:56 PM
indygreg added a reviewer for D7221: hghave: fix bytes/string issue on Python 3: durin42.
Aug 8 2020, 4:56 PM
indygreg added a comment to D7221: hghave: fix bytes/string issue on Python 3.

A similar patch already landed. I'm going to commandeer and close.

Aug 8 2020, 4:56 PM
D8782: tests: make flag parsing test more future safe is now accepted and ready to land.
Aug 8 2020, 4:54 PM
indygreg added a comment to D8840: rename: add support for --at-rev, which marks as copy and removes the source.

I'm not sure what the README.rst rename was doing in the diff. So I dropped it in-flight.

Aug 8 2020, 4:52 PM
D8840: rename: add support for --at-rev, which marks as copy and removes the source is now accepted and ready to land.
Aug 8 2020, 4:51 PM
D8813: tests: make test-install.t work on debian systems is now accepted and ready to land.

Debian's perturbations to how Python is packaged continue to confound me. There's aren't enough Picard facepalm memes to express my feelings on the matter.

Aug 8 2020, 4:32 PM
indygreg added inline comments to D8872: rhg: make output of `files` relative to the current directory and the root.
Aug 8 2020, 4:19 PM
D8871: rhg: handle broken pipe error for stderr is now accepted and ready to land.
Aug 8 2020, 4:12 PM
D8870: rhg: extract function handle_stdout_error is now accepted and ready to land.
Aug 8 2020, 4:12 PM
D8869: rhg: add a limited `rhg files` subcommand is now accepted and ready to land.
Aug 8 2020, 4:11 PM
D8868: rhg: add a `Files` `Command` to prepare the `rhg files` subcommand is now accepted and ready to land.
Aug 8 2020, 4:09 PM
D8623: rebase: add a config knob for forcing in-memory rebasing now requires changes to proceed.
Aug 8 2020, 4:05 PM
D8562: shelve: get mergestate via context now requires changes to proceed.
Aug 8 2020, 4:05 PM
D8561: hg: get mergestate via context now requires changes to proceed.
Aug 8 2020, 4:05 PM
D8559: revset: get mergestate via context now requires changes to proceed.
Aug 8 2020, 4:05 PM
D8560: templatekw: get mergestate via context now requires changes to proceed.
Aug 8 2020, 4:05 PM
D8558: fileset: get mergestate via context now requires changes to proceed.
Aug 8 2020, 4:04 PM
D8557: debugcommands: get mergestate via context now requires changes to proceed.
Aug 8 2020, 4:04 PM
D8555: cmdutil: get mergestate via context now requires changes to proceed.
Aug 8 2020, 4:04 PM
D8556: commands: get mergestate via context now requires changes to proceed.
Aug 8 2020, 4:04 PM
D8554: strip: get mergestate via context now requires changes to proceed.
Aug 8 2020, 4:04 PM
D8553: histedit: use context to load mergestate instead of loading it directly now requires changes to proceed.
Aug 8 2020, 4:04 PM
D8552: fix: use context to fetch mergestate instead of loading it directly now requires changes to proceed.
Aug 8 2020, 4:04 PM
D8867: rhg: simplify `FindRootError` handling is now accepted and ready to land.
Aug 8 2020, 4:03 PM
D8866: rhg: add buffered stdout writing possibility is now accepted and ready to land.
Aug 8 2020, 4:02 PM
D8865: rhg: ask the error message from `CommandError` is now accepted and ready to land.
Aug 8 2020, 3:59 PM
D8864: rhg: Do not return error when when we really mean ok in commands is now accepted and ready to land.
Aug 8 2020, 3:54 PM
D8863: hg-core: define a `ListTrackedFiles` `Operation` is now accepted and ready to land.
Aug 8 2020, 3:50 PM
D8862: hg-core: remove the `Operation` trait is now accepted and ready to land.
Aug 8 2020, 3:44 PM
D8861: hg-core: make parse_dirstate return references rather than update hashmaps is now accepted and ready to land.
Aug 8 2020, 3:43 PM
indygreg added a comment to D8552: fix: use context to fetch mergestate instead of loading it directly.

@durin42 what's the state of this series? Can the bottom part of it be reviewed or do you plan to revisit the entire series? Perhaps a rebase would be in order, just in case?

Aug 8 2020, 3:05 PM
D8913: scmutil: introduce filterrequirements() to split reqs into wc and store ones is now accepted and ready to land.

I'm going to approve but will hold off landing until the following patch solidifies a bit.

Aug 8 2020, 1:17 PM
indygreg added inline comments to D8908: store: refactor space delimited list to proper tuple.
Aug 8 2020, 1:13 PM
D8912: repository: introduce constant for internal phase repo requirement and use it is now accepted and ready to land.
Aug 8 2020, 1:07 PM
D8911: repository: introduce constant for sparse repo requirement and use it is now accepted and ready to land.
Aug 8 2020, 1:06 PM
D8910: localrepo: refactor `.hg/requires` reading logic in separate function is now accepted and ready to land.
Aug 8 2020, 1:04 PM
D8909: localrepo: refactor logic to calculate sharedvfs in separate fn is now accepted and ready to land.
Aug 8 2020, 1:03 PM
D8908: store: refactor space delimited list to proper tuple is now accepted and ready to land.
Aug 8 2020, 1:01 PM
D8915: makefile: stop setting unused HGEXTDIR variable during osx build is now accepted and ready to land.
Aug 8 2020, 1:00 PM
indygreg added a comment to D8887: mergeresult: add `files()` and use it.

FWIW I encountered the following test failure when running this series locally:

Aug 8 2020, 12:51 PM
D8904: merge: drop commitinfo argument to applyupdates (API) is now accepted and ready to land.
Aug 8 2020, 12:37 PM
D8903: merge: remove emptyactions() and use collections.defaultdict(list) instead is now accepted and ready to land.

I guess we lose some typing as part of this change. But that only guards against unknown actions, which I suppose shouldn't happen.

Aug 8 2020, 12:36 PM
D8889: merge: pass mergeresult obj in _forgetremoved() (API) is now accepted and ready to land.
Aug 8 2020, 12:34 PM
D8888: mergeresult: introduce filemap() which yields filename based mapping is now accepted and ready to land.
Aug 8 2020, 12:34 PM
D8887: mergeresult: add `files()` and use it is now accepted and ready to land.
Aug 8 2020, 12:33 PM
D8886: mergeresult: introduce getfile() and use it where required is now accepted and ready to land.
Aug 8 2020, 12:30 PM
D8885: merge: use ACTION_* constants instead of values in _filternarrowactions() is now accepted and ready to land.
Aug 8 2020, 12:27 PM
D8884: merge: rework iteration over mergeresult object in checkpathconflicts() is now accepted and ready to land.
Aug 8 2020, 12:27 PM
D8883: applyupdates: simplfy calculation of number of updated files is now accepted and ready to land.
Aug 8 2020, 12:26 PM
D8882: mergeresult: yield from getactions() instead of buidling a list and returning is now accepted and ready to land.

Yeah, I suppose mutation during iteration will make a lot of noise. So as long as we have test coverage of this code, we should be fine.

Aug 8 2020, 12:25 PM
D8881: sparse: replace merge action values with mergestate.ACTION_* constants is now accepted and ready to land.
Aug 8 2020, 12:23 PM
D8880: mergeresult: implement a len() function and use it is now accepted and ready to land.
Aug 8 2020, 12:23 PM
D8879: merge: replace use of actions dict with mergeresult object is now accepted and ready to land.

The introduction of sorting here is interesting. I guess we never sorted filenames before performing working directory modifications before? But surely there is sorting happening elsewhere because anything with ui output would need to be sorted to ensure determinism. And surely tests would have caught that.

Aug 8 2020, 12:22 PM
D8878: mergeresult: add sort argument to getactions() method is now accepted and ready to land.
Aug 8 2020, 12:14 PM
D8877: merge: pass mergeresult obj in merge._prefetchfiles() is now accepted and ready to land.
Aug 8 2020, 12:13 PM
D8876: merge: pass mergeresult obj instead of actions in applyupdates() (API) is now accepted and ready to land.
Aug 8 2020, 12:12 PM
D8875: merge: pass mergeresult obj instead of actions in _checkcollision() (API) is now accepted and ready to land.
Aug 8 2020, 12:03 PM

Aug 6 2020

indygreg added a comment to D8633: share: introduce config option to store requires in .hg/store.

I left a handful of comments.

Aug 6 2020, 9:43 PM
D8907: templater: teach template loader to use open_template() function is now accepted and ready to land.
Aug 6 2020, 8:31 PM
D8906: templater: restructure open_template() a little to prepare for relative paths is now accepted and ready to land.
Aug 6 2020, 8:31 PM
D8905: templater: add exception-raising version of open_template() is now accepted and ready to land.
Aug 6 2020, 8:29 PM
D8902: templater: replace Py3-only exception types by super-types available in Py2 is now accepted and ready to land.
Aug 6 2020, 8:28 PM

Aug 5 2020

indygreg added a comment to D8633: share: introduce config option to store requires in .hg/store.

I need to think about the implications of this change a bit more: the requires file plays an important part in how clients open repositories and there are significant backwards and forwards compatibility concerns.

Aug 5 2020, 9:08 PM
indygreg added inline comments to D8894: templater: make open_template() read from resources if in frozen binary.
Aug 5 2020, 9:00 PM
D8901: hgweb: enable reading styles from resources in frozen binaries is now accepted and ready to land.
Aug 5 2020, 8:40 PM
D8900: hgweb: rely on open_template()'s fallback to using templatedir() is now accepted and ready to land.
Aug 5 2020, 8:39 PM
D8899: hgweb: open mapfile using templater.open_template() is now accepted and ready to land.
Aug 5 2020, 8:38 PM
D8898: hgweb: simplify a constant-length list by converting to literal tuple is now accepted and ready to land.
Aug 5 2020, 8:37 PM
D8897: hgweb: remove some accesses to private member uimod._unset is now accepted and ready to land.
Aug 5 2020, 8:37 PM
D8896: templater: try to read %include in mapfiles from resources is now accepted and ready to land.
Aug 5 2020, 8:35 PM
D8895: templater: unroll loop over mapfile directories is now accepted and ready to land.
Aug 5 2020, 8:35 PM
D8894: templater: make open_template() read from resources if in frozen binary is now accepted and ready to land.
Aug 5 2020, 8:31 PM
D8893: templater: pass opened file-like object to templatespec is now accepted and ready to land.
Aug 5 2020, 8:30 PM
D8892: templater: replace templatepath() with function that also opens the file is now accepted and ready to land.
Aug 5 2020, 8:26 PM
D8891: templater: start passing resource to read from into _readmapfile() is now accepted and ready to land.
Aug 5 2020, 8:25 PM
D8890: templater: move stylemap() to hgweb_mod, since that's its only user is now accepted and ready to land.
Aug 5 2020, 8:23 PM
D8874: hgweb: simplify staticfile() now that we always pass it a single directory is now accepted and ready to land.
Aug 5 2020, 8:23 PM

Aug 3 2020

indygreg added a comment to D8854: templates: add __init__.py files to templates/ dirs.

Having thought about this a bit more, I think using the importlib.resources high-level APIs are better. i.e. this series as-is is fine.

Aug 3 2020, 10:59 PM

Aug 2 2020

D8772: localrepo: abort creating a shared repo if the source does not have store is now accepted and ready to land.
Aug 2 2020, 3:53 PM
D8771: localrepo: only use 'bookmarksinstore' requirement if we have 'store' is now accepted and ready to land.
Aug 2 2020, 3:48 PM
D8837: mergeresult: make actionmapping a dict of dict instead of dict of lists is now accepted and ready to land.
Aug 2 2020, 1:35 PM
D8836: largefiles: introduce a constant for 'lfmr' action is now accepted and ready to land.

Oh yay - I should have looked at the next commit before commenting on the prior one ;)

Aug 2 2020, 1:30 PM
D8835: largefiles: override merge.emptyactions() to include `lfmr` is now accepted and ready to land.
Aug 2 2020, 1:29 PM
D8834: merge: unify logic of couple of if-else's in manifestmerge() is now accepted and ready to land.

I'm only +0 on this refactor, as I don't think it changes readability much. But whatever.

Aug 2 2020, 1:27 PM
D8833: sparse: add comment for an if condition which I tried to refactor is now accepted and ready to land.
Aug 2 2020, 1:25 PM
D8832: mergeactions: use action constants instead of string values is now accepted and ready to land.

THANK YOU!

Aug 2 2020, 1:25 PM
D8831: merge: use the new action based mapping introduced in mergeresult obj is now accepted and ready to land.

This is a nice cleanup and improves readability!

Aug 2 2020, 1:22 PM