This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6409

convert: don't include file in "files" list if it's added in p2
ClosedPublic

Authored by martinvonz on May 17 2019, 2:49 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGc0e1ea0c4cee: convert: don't include file in "files" list if it's added in p2
Summary

If the file is from p2, we should clearly compare the flags to what
they were in p2.

Also note that manifest.flags('non-existent') unfortunately returns ''
instead of erroring out.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.May 17 2019, 2:49 PM
Closed by commit rHGc0e1ea0c4cee: convert: don't include file in "files" list if it's added in p2 (authored by martinvonz). · Explain WhyMay 20 2019, 11:46 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/localrepo.py (5 lines)
Mtests/test-convert-hg-sink.t (5 lines)

Diff 15190

mercurial/localrepo.py

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):
node = fctx.filenode() node = fctx.filenode()
if node in [fparent1, fparent2]: if node in [fparent1, fparent2]:
self.ui.debug('reusing %s filelog entry\n' % fname) self.ui.debug('reusing %s filelog entry\n' % fname)
if manifest1.flags(fname) != fctx.flags(): if ((fparent1 != nullid and
manifest1.flags(fname) != fctx.flags()) or
(fparent2 != nullid and
manifest2.flags(fname) != fctx.flags())):
changelist.append(fname) changelist.append(fname)
return node return node
flog = self.file(fname) flog = self.file(fname)
meta = {} meta = {}
cfname = fctx.copysource() cfname = fctx.copysource()
if cfname and cfname != fname: if cfname and cfname != fname:
# Mark the new revision of this file as a copy of another # Mark the new revision of this file as a copy of another

tests/test-convert-hg-sink.t

o 3 merge o 3 merge
|\ |\
| o 2 add file | o 2 add file
| | | |
o | 1 add executable file o | 1 add executable file
|/ |/
o 0 add 0 o 0 add 0
BROKEN: now 'a' appears changed
# Still no files
$ hg log -r 3 -T '{files}\n' $ hg log -r 3 -T '{files}\n'
a
#endif #endif