Show More
@@ -123,7 +123,7 b' def _kw_diff(repo, node1=None, node2=Non' | |||||
123 | comparing against working dir.''' |
|
123 | comparing against working dir.''' | |
124 | if node2 is not None: |
|
124 | if node2 is not None: | |
125 | kwtools['templater'].matcher = util.never |
|
125 | kwtools['templater'].matcher = util.never | |
126 | if node1 is not None and node1 != repo.changectx().node(): |
|
126 | elif node1 is not None and node1 != repo.changectx().node(): | |
127 | kwtools['templater'].restrict = True |
|
127 | kwtools['templater'].restrict = True | |
128 | _patch_diff(repo, node1=node1, node2=node2, files=files, match=match, |
|
128 | _patch_diff(repo, node1=node1, node2=node2, files=files, match=match, | |
129 | fp=fp, changes=changes, opts=opts) |
|
129 | fp=fp, changes=changes, opts=opts) | |
@@ -458,7 +458,7 b' def reposetup(ui, repo):' | |||||
458 | files configured at all for keyword substitution.''' |
|
458 | files configured at all for keyword substitution.''' | |
459 |
|
459 | |||
460 | try: |
|
460 | try: | |
461 |
if (not repo.local() or kwtools['hgcmd'] in nokwcommands.split() |
|
461 | if (not repo.local() or kwtools['hgcmd'] in nokwcommands.split() | |
462 | or '.hg' in util.splitpath(repo.root) |
|
462 | or '.hg' in util.splitpath(repo.root) | |
463 | or repo._url.startswith('bundle:')): |
|
463 | or repo._url.startswith('bundle:')): | |
464 | return |
|
464 | return |
General Comments 0
You need to be logged in to leave comments.
Login now