Mercurial > hg-stable
changeset 18142:11d1a9143adb
merge with stable
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Fri, 28 Dec 2012 11:55:45 +0100 |
| parents | d8e7b3a14957 (current diff) a907826c158c (diff) |
| children | 242d2f4ec01c |
| files | hgext/largefiles/overrides.py hgext/largefiles/reposetup.py mercurial/bundlerepo.py |
| diffstat | 4 files changed, 14 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/largefiles/overrides.py Fri Dec 28 00:02:40 2012 +0100 +++ b/hgext/largefiles/overrides.py Fri Dec 28 11:55:45 2012 +0100 @@ -567,6 +567,7 @@ lfdirstate = lfutil.openlfdirstate(ui, repo) (modified, added, removed, missing, unknown, ignored, clean) = \ lfutil.lfdirstatestatus(lfdirstate, repo, repo['.'].rev()) + lfdirstate.write() for lfile in modified: lfutil.updatestandin(repo, lfutil.standin(lfile)) for lfile in missing:
--- a/hgext/largefiles/reposetup.py Fri Dec 28 00:02:40 2012 +0100 +++ b/hgext/largefiles/reposetup.py Fri Dec 28 11:55:45 2012 +0100 @@ -168,10 +168,8 @@ m = copy.copy(match) m._files = tostandins(m._files) - # Get ignored files here even if we weren't asked for them; we - # must use the result here for filtering later result = super(lfilesrepo, self).status(node1, node2, m, - True, clean, unknown, listsubrepos) + ignored, clean, unknown, listsubrepos) if working: try: # Any non-largefiles that were explicitly listed must be @@ -273,6 +271,8 @@ return f result = [[toname(f) for f in items] for items in result] + lfdirstate.write() + if not listunknown: result[4] = [] if not listignored:
--- a/mercurial/bundlerepo.py Fri Dec 28 00:02:40 2012 +0100 +++ b/mercurial/bundlerepo.py Fri Dec 28 11:55:45 2012 +0100 @@ -352,7 +352,7 @@ os.unlink(bundlename) except OSError: pass - return other, [], other.close + return repo, [], other.close bundle = None bundlerepo = None
--- a/tests/test-transplant.t Fri Dec 28 00:02:40 2012 +0100 +++ b/tests/test-transplant.t Fri Dec 28 11:55:45 2012 +0100 @@ -288,6 +288,15 @@ 1 b1 0 r1 +remote transplant without pull + + $ hg pull -q http://localhost:$HGPORT/ + $ hg transplant -s http://localhost:$HGPORT/ 2 4 + searching for changes + skipping already applied revision 2:8d9279348abb + applying 722f4667af76 + 722f4667af76 transplanted to 76e321915884 + transplant --continue $ hg init ../tc