##// END OF EJS Templates
largefiles: get cwd and relative paths from repo instead of matcher...
Martin von Zweigbergk -
r41816:8fa1a5fb default
parent child Browse files
Show More
@@ -301,9 +301,10 b' def overridelog(orig, ui, repo, *pats, *'
301 return kindpat[0] + ':' + tostandin(kindpat[1])
301 return kindpat[0] + ':' + tostandin(kindpat[1])
302 return tostandin(kindpat[1])
302 return tostandin(kindpat[1])
303
303
304 if m._cwd:
304 cwd = repo.getcwd()
305 if cwd:
305 hglf = lfutil.shortname
306 hglf = lfutil.shortname
306 back = util.pconvert(m.rel(hglf)[:-len(hglf)])
307 back = util.pconvert(repo.pathto(hglf)[:-len(hglf)])
307
308
308 def tostandin(f):
309 def tostandin(f):
309 # The file may already be a standin, so truncate the back
310 # The file may already be a standin, so truncate the back
@@ -316,10 +317,10 b' def overridelog(orig, ui, repo, *pats, *'
316 # path to the root before building the standin. Otherwise cwd
317 # path to the root before building the standin. Otherwise cwd
317 # is somewhere in the repo, relative to root, and needs to be
318 # is somewhere in the repo, relative to root, and needs to be
318 # prepended before building the standin.
319 # prepended before building the standin.
319 if os.path.isabs(m._cwd):
320 if os.path.isabs(cwd):
320 f = f[len(back):]
321 f = f[len(back):]
321 else:
322 else:
322 f = m._cwd + '/' + f
323 f = cwd + '/' + f
323 return back + lfutil.standin(f)
324 return back + lfutil.standin(f)
324 else:
325 else:
325 def tostandin(f):
326 def tostandin(f):
General Comments 0
You need to be logged in to leave comments. Login now