Mercurial > hg
comparison hgext/strip.py @ 45514:93a0f3ba36bb
merge with stable
author | Augie Fackler <augie@google.com> |
---|---|
date | Mon, 21 Sep 2020 15:05:38 -0400 |
parents | 0ce6af73f481 2bc978921e8a |
children | d7a508a75d72 |
comparison
equal
deleted
inserted
replaced
45513:22140fd783d2 | 45514:93a0f3ba36bb |
---|---|
252 urev = _findupdatetarget(repo, revs) | 252 urev = _findupdatetarget(repo, revs) |
253 uctx = repo[urev] | 253 uctx = repo[urev] |
254 | 254 |
255 # only reset the dirstate for files that would actually change | 255 # only reset the dirstate for files that would actually change |
256 # between the working context and uctx | 256 # between the working context and uctx |
257 descendantrevs = repo.revs(b"%d::.", uctx.rev()) | 257 descendantrevs = repo.revs(b"only(., %d)", uctx.rev()) |
258 changedfiles = [] | 258 changedfiles = [] |
259 for rev in descendantrevs: | 259 for rev in descendantrevs: |
260 # blindly reset the files, regardless of what actually changed | 260 # blindly reset the files, regardless of what actually changed |
261 changedfiles.extend(repo[rev].files()) | 261 changedfiles.extend(repo[rev].files()) |
262 | 262 |