Bug 4330 - Committing a directory with changed regular files and unchanged large files fails
Summary: Committing a directory with changed regular files and unchanged large files f...
Status: RESOLVED FIXED
Alias: None
Product: Mercurial
Classification: Unclassified
Component: largefiles (show other bugs)
Version: 3.1
Hardware: PC Mac OS
: normal bug
Assignee: Bugzilla
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-08-11 21:39 UTC by Andrew Taumoefolau
Modified: 2015-01-28 01:00 UTC (History)
5 users (show)

See Also:
Python Version: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Andrew Taumoefolau 2014-08-11 21:39 UTC
Attempting to commit a specific directory that contains an unchanged large file but a changed regular file results in a failure.

To reproduce:

$ hg init
$ mkdir foo
$ touch foo/bar
$ hg add --large foo/bar
$ hg ci -m "adding foo/bar"
$ touch foo/baz
$ hg add foo/baz
$ hg ci -m "adding foo/baz" foo
abort: .hglf/foo: no match under directory!

Not specifying the directory or specifying the file inside the directory is fine:

$ hg ci -m "adding foo/baz"  # fine
$ hg rollback
$ hg ci -m "adding foo/baz" foo/baz  # also fine
Comment 1 HG Bot 2015-01-20 18:00 UTC
Fixed by http://selenic.com/repo/hg/rev/ab6fd3205dad
Matt Harbison <matt_harbison@yahoo.com>
largefiles: fix commit of a directory with no largefile changes (issue4330)

When a directory is named in the commit file list, the previous behavior was to
walk the list, and if no normal files in the directory were also named, add the
corresponding standin for each largefile in that directory.  The directory is
then dropped from the list, so that committing a directory with no normal file
changes works.  It then added the corresponding standin directory for the first
largefile seen, by prefixing it with '.hglf/'.

The latter is unnecessary since each affected largefile is explicitly referenced
by its standin in the list.  It also caused an abort if there were no changed
largefiles in the directory, because none of its standins changed:

    abort: .hglf/foo/bar: no match under directory!

This list of files is used to tweak a matcher in lfutil.updatestandinsbymatch(),
which is what is passed to commit().

The status() call that is ultimately done in the commit code with this matcher
seems to have some OS specific differences.  It is not necessary to append '.'
for Windows to run the largefiles tests cleanly.  But if '.' is not added to the
list, the match function isn't called on Linux, so status() would miss any
normal files that were also in a named directory.  The commit then proceeds
without those normal files, or says "nothing changed" if there were no changed
largefiles in the directory.  This is not filesystem specific, as VFAT on Linux
had the same behavior as when run on ext4.  It is also not an issue with
lfilesrepo.status(), since that only calls the overridden implementation when
paths are passed to commit.  I dont have access to an OS X machine ATM to test
there.

Maybe there's a better way to do this.  But since the standin directory for the
first largefile was previously being added, and that caused the same walk in
status(), there's no preformance change to this.  There is no danger of
erroneously committing files in '.', because the original match function is
called, and if it fails, the lfutil.updatestandinsbymatch() tweaked matcher only
indicates a match if the file is in the list of standins- and '.' never is.  The
added tests confirm this.

(please test the fix)
Comment 2 Bugzilla 2015-01-28 01:00 UTC
Bug was set to TESTING for 7 days, resolving