Show More
@@ -224,13 +224,7 b' def getstandinmatcher(repo, pats=[], opt' | |||||
224 | '''Return a match object that applies pats to the standin directory''' |
|
224 | '''Return a match object that applies pats to the standin directory''' | |
225 | standindir = repo.wjoin(shortname) |
|
225 | standindir = repo.wjoin(shortname) | |
226 | if pats: |
|
226 | if pats: | |
227 | # patterns supplied: search standin directory relative to current dir |
|
227 | pats = [os.path.join(standindir, pat) for pat in pats] | |
228 | cwd = repo.getcwd() |
|
|||
229 | if os.path.isabs(cwd): |
|
|||
230 | # cwd is an absolute path for hg -R <reponame> |
|
|||
231 | # work relative to the repository root in this case |
|
|||
232 | cwd = '' |
|
|||
233 | pats = [os.path.join(standindir, cwd, pat) for pat in pats] |
|
|||
234 | elif os.path.isdir(standindir): |
|
228 | elif os.path.isdir(standindir): | |
235 | # no patterns: relative to repo root |
|
229 | # no patterns: relative to repo root | |
236 | pats = [standindir] |
|
230 | pats = [standindir] |
@@ -1987,6 +1987,34 b" Test commit's addremove option prior to " | |||||
1987 | .hglf/large.dat |
|
1987 | .hglf/large.dat | |
1988 | .hglf/large2.dat |
|
1988 | .hglf/large2.dat | |
1989 |
|
1989 | |||
|
1990 | Test actions on largefiles using relative paths from subdir | |||
|
1991 | ||||
|
1992 | $ mkdir sub | |||
|
1993 | $ cd sub | |||
|
1994 | $ echo anotherlarge > anotherlarge | |||
|
1995 | $ hg add --large anotherlarge | |||
|
1996 | $ hg st | |||
|
1997 | A sub/anotherlarge | |||
|
1998 | $ hg st anotherlarge | |||
|
1999 | A anotherlarge | |||
|
2000 | $ hg commit -m anotherlarge anotherlarge | |||
|
2001 | Invoking status precommit hook | |||
|
2002 | A sub/anotherlarge | |||
|
2003 | $ hg log anotherlarge | |||
|
2004 | changeset: 1:9627a577c5e9 | |||
|
2005 | tag: tip | |||
|
2006 | user: test | |||
|
2007 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
2008 | summary: anotherlarge | |||
|
2009 | ||||
|
2010 | $ echo more >> anotherlarge | |||
|
2011 | $ hg st . | |||
|
2012 | M anotherlarge | |||
|
2013 | $ hg revert anotherlarge | |||
|
2014 | $ hg st | |||
|
2015 | ? sub/anotherlarge.orig | |||
|
2016 | $ cd .. | |||
|
2017 | ||||
1990 | $ cd .. |
|
2018 | $ cd .. | |
1991 |
|
2019 | |||
1992 | issue3651: summary/outgoing with largefiles shows "no remote repo" |
|
2020 | issue3651: summary/outgoing with largefiles shows "no remote repo" |
General Comments 0
You need to be logged in to leave comments.
Login now