Skip to content
Snippets Groups Projects
Commit bb3ee61c authored by Matt Harbison's avatar Matt Harbison
Browse files

largefiles: don't print files as both large and normal in addremove dryruns

parent 6b1428e5
No related branches found
No related tags found
No related merge requests found
......@@ -34,6 +34,10 @@
m.matchfn = lambda f: lfile(f) and origmatchfn(f)
return m
def composenormalfilematcher(match, manifest):
def composenormalfilematcher(match, manifest, exclude=None):
excluded = set()
if exclude is not None:
excluded.update(exclude)
m = copy.copy(match)
notlfile = lambda f: not (lfutil.isstandin(f) or lfutil.standin(f) in
......@@ -38,6 +42,6 @@
m = copy.copy(match)
notlfile = lambda f: not (lfutil.isstandin(f) or lfutil.standin(f) in
manifest)
manifest or f in excluded)
m._files = filter(notlfile, m._files)
m._fmap = set(m._files)
m._always = False
......@@ -1132,7 +1136,7 @@
removelargefiles(repo.ui, repo, True, m, **opts)
# Call into the normal add code, and any files that *should* be added as
# largefiles will be
addlargefiles(repo.ui, repo, True, matcher, **opts)
added, bad = addlargefiles(repo.ui, repo, True, matcher, **opts)
# Now that we've handled largefiles, hand off to the original addremove
# function to take care of the rest. Make sure it doesn't do anything with
# largefiles by passing a matcher that will ignore them.
......@@ -1136,7 +1140,7 @@
# Now that we've handled largefiles, hand off to the original addremove
# function to take care of the rest. Make sure it doesn't do anything with
# largefiles by passing a matcher that will ignore them.
matcher = composenormalfilematcher(matcher, repo[None].manifest())
matcher = composenormalfilematcher(matcher, repo[None].manifest(), added)
return orig(repo, matcher, prefix, opts, dry_run, similarity)
# Calling purge with --all will cause the largefiles to be deleted.
......
......@@ -262,7 +262,6 @@
removing subrepo/large.txt
adding subrepo/normal.txt
adding subrepo/renamed-large.txt
adding large.dat
$ hg status -S
! subrepo/large.txt
? large.dat
......@@ -295,7 +294,6 @@
removing subrepo/large.txt
adding subrepo/normal.txt
adding subrepo/renamed-large.txt
adding large.dat
$ cd statusmatch
$ mv subrepo/renamed-large.txt subrepo/large.txt
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment