Changeset View
Changeset View
Standalone View
Standalone View
mercurial/localrepo.py
| Show First 20 Lines • Show All 2799 Lines • ▼ Show 20 Line(s) | ): | ||||
| The resulting filenode | The resulting filenode | ||||
| """ | """ | ||||
| fname = fctx.path() | fname = fctx.path() | ||||
| fparent1 = manifest1.get(fname, nullid) | fparent1 = manifest1.get(fname, nullid) | ||||
| fparent2 = manifest2.get(fname, nullid) | fparent2 = manifest2.get(fname, nullid) | ||||
| if isinstance(fctx, context.filectx): | if isinstance(fctx, context.filectx): | ||||
| # This block fast path most comparison usually done, It is making | |||||
durin42: I tried to copyedit this comment, but it's still somewhat self-contradictory. I'm also… | |||||
pulkitUnsubmitted Not Done ReplyThis comment still needs some work. pulkit: This comment still needs some work. | |||||
marmouteAuthorUnsubmitted Done ReplyWhat work do you want to see? (this comment exists because I tried to be nice after reading the code, If this is delaying this series further, we can drop it). marmoute: What work do you want to see? (this comment exists because I tried to be nice after reading the… | |||||
pulkitUnsubmitted Not Done ReplyI understand your efforts here. I mean it's still confusing for a non-native like me. This block fast path most comparisons which are usually done. It assumes that bare filectx is used and no merge happened, hence no need to create a new file revision in this case. Shall I reword it to above in flight? Also, it's not blocking the series since I already queued some of later ones. pulkit: I understand your efforts here. I mean it's still confusing for a non-native like me.
```
This… | |||||
marmouteAuthorUnsubmitted Done ReplyReads good to me. Go ahead with the rephrasing. marmoute: Reads good to me. Go ahead with the rephrasing. | |||||
| # the assumption that a bare filectx is used, and that no merge | |||||
Not Done Replyseems like is should not be there pulkit: seems like `is` should not be there | |||||
Done ReplyIt should not marmoute: It should not | |||||
| # happened on this file. | |||||
Not Done Replythere are no chance? pulkit: there are no chance? | |||||
Done Replythere are no chance marmoute: there are no chance | |||||
| # | |||||
| # It assume they are no need to a create a new file revision in | |||||
| # this case. | |||||
| node = fctx.filenode() | node = fctx.filenode() | ||||
| if node in [fparent1, fparent2]: | if node in [fparent1, fparent2]: | ||||
| self.ui.debug(b'reusing %s filelog entry\n' % fname) | self.ui.debug(b'reusing %s filelog entry\n' % fname) | ||||
| if ( | if ( | ||||
| fparent1 != nullid | fparent1 != nullid | ||||
| and manifest1.flags(fname) != fctx.flags() | and manifest1.flags(fname) != fctx.flags() | ||||
| ) or ( | ) or ( | ||||
| fparent2 != nullid | fparent2 != nullid | ||||
| ▲ Show 20 Lines • Show All 988 Lines • Show Last 20 Lines | |||||
I tried to copyedit this comment, but it's still somewhat self-contradictory. I'm also completely lost on the first clause ("This block fast path most comparison") - could you take a fresh start on this comment (and maybe spend more words on it?) and/or ask someone else to help interactively?
(I also see that line 2182 looks like you marked the comment resolved but didn't actually update the code?)