Mercurial > hg
diff hgext/largefiles/lfutil.py @ 18490:877f80599df0 stable
largefiles: fix commit when using relative paths from subdirectory
Remove cwd handling from getstandinmatcher - it did not belong there, as proven
by the tests.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Fri, 25 Jan 2013 16:59:34 +0100 |
parents | 745bc16ccef2 |
children | 894a5897a9dd |
line wrap: on
line diff
--- a/hgext/largefiles/lfutil.py Mon Jan 28 15:19:44 2013 +0100 +++ b/hgext/largefiles/lfutil.py Fri Jan 25 16:59:34 2013 +0100 @@ -224,13 +224,7 @@ '''Return a match object that applies pats to the standin directory''' standindir = repo.wjoin(shortname) if pats: - # patterns supplied: search standin directory relative to current dir - cwd = repo.getcwd() - if os.path.isabs(cwd): - # cwd is an absolute path for hg -R <reponame> - # work relative to the repository root in this case - cwd = '' - pats = [os.path.join(standindir, cwd, pat) for pat in pats] + pats = [os.path.join(standindir, pat) for pat in pats] elif os.path.isdir(standindir): # no patterns: relative to repo root pats = [standindir]