This looks good to me. Greg?
- Queries
- All Stories
- Search
- Advanced Search
Feed Advanced Search
Advanced Search
Advanced Search
Today
Today
martinvonz accepted D6310: narrow: send specs as bundle2 data instead of param (issue5952) (issue6019).
tests: demonstrate `hg log -r . <file>` linkrev bug
I think the rest of the stack from this patch are independent of the ones before, so if reviewers are intimidated by D6255, they should still be able to take this section of the stack.
Yesterday
Yesterday
tests: demonstrate `hg log -r . <file>` linkrev bug
This series looks reasonable to me, but I have no experience with this code. Anyone else feels like reviewing? Otherwise I'll probably just queue it in a day or two.
martinvonz added inline comments to D6301: phabricator: fallback to reading metadata from diff for phabread.
martinvonz added inline comments to D6301: phabricator: fallback to reading metadata from diff for phabread.
martinvonz added inline comments to D6310: narrow: send specs as bundle2 data instead of param (issue5952) (issue6019).
martinvonz added inline comments to D6308: context: check file exists before getting data from _wrappedctx.
martinvonz added inline comments to D6308: context: check file exists before getting data from _wrappedctx.
martinvonz added inline comments to D6308: context: check file exists before getting data from _wrappedctx.
martinvonz added inline comments to D6307: tests: show IMM is broken when merging file empty in destination.
Tue, Apr 23
Tue, Apr 23
match: remove unused match.__iter__ implementation (API)
martinvonz added inline comments to D6167: fix: allow fixer tools to return metadata in addition to the file content.
Mon, Apr 22
Mon, Apr 22
martinvonz added inline comments to D6167: fix: allow fixer tools to return metadata in addition to the file content.
martinvonz added a comment to D6167: fix: allow fixer tools to return metadata in addition to the file content.
I don't like to queue patches that are written mainly for Google's benefit, but it's been a month and we haven't heard any complaints. I'll start reviewing this now and will queue it when I'm done (assuming I have no major comments, of course).
Sun, Apr 21
Sun, Apr 21
martinvonz committed rHG802ae9772ced: tests: make log style a little easier to read in test-copytrace-heuristics.t.
tests: make log style a little easier to read in test-copytrace-heuristics.t
Fri, Apr 19
Fri, Apr 19
tests: avoid cryptic nodeids in tests/test-rename-merge1.t
martinvonz committed rHG1afd9d1e55ca: tests: defines aliases for `hg log` calls in test-copytrace-heuristics.t.
tests: defines aliases for `hg log` calls in test-copytrace-heuristics.t
Thu, Apr 18
Thu, Apr 18
martinvonz added a comment to D6183: copies: add config option for writing copy metadata to file and/or changset.
In D6183#91062, @indygreg wrote:An idea to consider (which may have been proposed already) is to write a *no copy metadata* entry into extras when writing copy metadata to the changelog. If we did things this way, a new client could know definitively that no copy metadata is available and to not fall back to reading from the filelogs. I haven't fully thought this through, but that should provide better compatibility between older and newer clients. Obviously the tradeoff is you could have a mixed repo (some changesets wouldn't have copy metadata in changelog) and you would need to duplicate copy metadata across changelog and filelogs to maintain compatibility. Something to contemplate...
martinvonz added a comment to D6183: copies: add config option for writing copy metadata to file and/or changset.
In D6183#91060, @indygreg wrote:I support experimenting with putting copy metadata in the changelog. And the patches before this one did a lot of work to allow copy metadata to be read from alternate sources, which is great, since it can allow flexibility in the future (think copy caches, copy modifications outside of a commit, etc).
martinvonz updated the diff for D6276: copies: clarify mutually exclusive cases in _chain() with a s/if/elif/.
martinvonz committed rHG84bd6ae2d1f6: narrow: also warn when not deleting untracked or ignored files.
narrow: also warn when not deleting untracked or ignored files
martinvonz committed rHGa68036b849b0: copies: delete debug message about "unmatched files new in both".
copies: delete debug message about "unmatched files new in both"
martinvonz committed rHG341bddf88ac5: copies: delete debug message about changes since common ancestor.
copies: delete debug message about changes since common ancestor
copies: delete debug message about search limit
martinvonz added a dependent revision for D6274: copies: document cases in _chain(): D6275: copies: delete a redundant cleanup step in _chain().
martinvonz committed rHGaa8f83923aef: narrow: also warn when not deleting untracked or ignored files.
narrow: also warn when not deleting untracked or ignored files
Wed, Apr 17
Wed, Apr 17
martinvonz committed rHG1e266bd9f25b: copies: delete debug message about "unmatched files new in both".
copies: delete debug message about "unmatched files new in both"
copies: delete debug message about search limit
martinvonz committed rHG43c2a13b56eb: copies: delete debug message about changes since common ancestor.
copies: delete debug message about changes since common ancestor
martinvonz committed rHG85f5934016f9: copies: move early return for "no copies" case a little earlier.
copies: move early return for "no copies" case a little earlier
martinvonz committed rHG22c9ffdf8ef6: copies: fix up "fullcopy" with missing entries from "diverge".
copies: fix up "fullcopy" with missing entries from "diverge"
copies: fix up "fullcopy" with missing entries from "copy"
merge: remove workaround for issue5020
martinvonz committed rHG31abb9d713af: copies: don't include copies that are not in source in directory move.
copies: don't include copies that are not in source in directory move
tests: add test for issue5343 (grafting with copies)
I haven't run tests on this, but I'm guessing one of the test-check* tests will tell you that your subject line ("Typos") does not follow our style guide (you could change it to something like "setdiscovery: fix a few typos").
martinvonz updated the diff for D6250: copies: delete debug message about changes since common ancestor.
martinvonz updated the diff for D6251: copies: delete debug message about "unmatched files new in both".
martinvonz updated the diff for D6248: copies: move early return for "no copies" case a little earlier.
martinvonz updated the diff for D6244: copies: don't include copies that are not in source in directory move.
martinvonz updated the diff for D6247: copies: fix up "fullcopy" with missing entries from "diverge".
tests: split out separate test for issue5020
martinvonz committed rHG351cbda889db: tests: avoid a rename/delete conflict when updating in test-narrow-update.t.
tests: avoid a rename/delete conflict when updating in test-narrow-update.t
tests: delete unused function in test-rename-merge2.t
tests: make merge conflicts explicit in `hg annotate` tests
martinvonz committed rHG770f5f586ae5: narrow: make warning about possibly dirty files respect ui.relative-paths.
narrow: make warning about possibly dirty files respect ui.relative-paths
In D6255#91146, @martinvonz wrote:In D6255#91019, @martinvonz wrote:In D6255#91015, @marmoute wrote:Since this seems the very same code as the previous clause, I wonder if
we could factor it out. This would help to prevent subtle bug when we
update it. (the answer might be "no because python is slow).Yes, I also considered that. I wasn't sure what a good name for the method would be and I gave up. I'll try again.
martinvonz retitled D6264: narrow: make warning about possibly dirty files respect ui.relative-paths from narrow: make warning about dirty possibly files respect ui.relative-paths to narrow: make warning about possibly dirty files respect ui.relative-paths.
martinvonz updated the diff for D6265: narrow: also warn when not deleting untracked or ignored files.
martinvonz added inline comments to D6265: narrow: also warn when not deleting untracked or ignored files.