D1106: context: add workingfilectx.markcopied

2017-10-18 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > context.py:1938 > > +def markcopied(self, src): > +"""marks this file a copy of `src`""" I would probably have put this on workingctx instead (not per file). It feels like it better matches how copies are recorded in the

D1106: context: add workingfilectx.markcopied

2017-10-16 Thread phillco (Phil Cohen)
This revision was automatically updated to reflect the committed changes. Closed by commit rHGcc1bf4612bb4: context: add workingfilectx.markcopied (authored by phillco, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1106?vs=2798=2867

D1106: context: add workingfilectx.markcopied

2017-10-16 Thread phillco (Phil Cohen)
phillco added a comment. I could split out the wctx passing, if necessary. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D1106 To: phillco, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list

D1106: context: add workingfilectx.markcopied

2017-10-15 Thread phillco (Phil Cohen)
phillco created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY With in-memory merge, copy information needs to be stored in-memory, not in the dirstate. To make this transition easy, move the existing dirstate-based