Mercurial > hg
comparison tests/test-copy.t @ 23958:df463ca0adef stable
largefiles: revert to lfilesrepo.status() being an unfiltered method
This effectively reverts 67d63ec85eb7, which caused some normal file copies to
not be displayed as copies. Other normal file copies could be displayed- the
exact reason isn't clear. This also adds two tests that were failing prior to
this backout, so that this can be sorted out next cycle.
The difference between copy cases that worked and those that didn't seemed to be
in copies.pathcopies(). When largefiles isn't enabled for the changed test, or
lfstatus is not set in the commands.status() override, 'y.ancestor(x) == x'.
That wasn't true otherwise, which fell through to the _chain() method. In this
case, the copy is removed in the criss cross loop.
'y.ancestor(x)' returns a context.changectx type, while 'x' is a lfilesctx type
in the failing case. I tried adding the ancestor method to the lfilesctx class
to change the type of the ancestor context, however the context when printed as
a string then gains a '+'. This points to it being a context.committablectx,
which clearly isn't correct for an ancestor. Possibly the problem is the
lfilesctx needs to subclass context.committablectx in some cases, but
context.changectx in others, within the same invocation? I'm not sure how to
pull that off, and backing out this change is safer during the freeze.
As to the status changing when a path is specified, I haven't looked into it
yet.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sun, 25 Jan 2015 22:55:10 -0500 |
parents | a387b0390082 |
children | 135b23868f45 |
comparison
equal
deleted
inserted
replaced
23957:0c4419faacbc | 23958:df463ca0adef |
---|---|
178 $ hg copy -f foo bar | 178 $ hg copy -f foo bar |
179 should show copy | 179 should show copy |
180 $ hg st -C | 180 $ hg st -C |
181 M bar | 181 M bar |
182 foo | 182 foo |
183 | |
184 XXX: filtering lfilesrepo.status() in 3.3-rc causes the copy source to not be | |
185 displayed. | |
186 $ hg st -C --config extensions.largefiles= | |
187 M bar | |
188 foo | |
189 | |
183 $ hg commit -m3 | 190 $ hg commit -m3 |
184 | 191 |
185 should show no parents for tip | 192 should show no parents for tip |
186 $ hg debugindex bar | 193 $ hg debugindex bar |
187 rev offset length ..... linkrev nodeid p1 p2 (re) | 194 rev offset length ..... linkrev nodeid p1 p2 (re) |