Show More
@@ -128,7 +128,7 b' class kwtemplater(object):' | |||
|
128 | 128 | |
|
129 | 129 | kwmaps = self.ui.configitems('keywordmaps') |
|
130 | 130 | if kwmaps: # override default templates |
|
131 |
kwmaps = [(k, templater.parsestring(v, |
|
|
131 | kwmaps = [(k, templater.parsestring(v, False)) | |
|
132 | 132 | for (k, v) in kwmaps] |
|
133 | 133 | self.templates = dict(kwmaps) |
|
134 | 134 | escaped = map(re.escape, self.templates.keys()) |
@@ -241,7 +241,7 b' class kwfilelog(filelog.filelog):' | |||
|
241 | 241 | def add(self, text, meta, tr, link, p1=None, p2=None): |
|
242 | 242 | '''Removes keyword substitutions when adding to filelog.''' |
|
243 | 243 | text = self.kwt.shrink(self.path, text) |
|
244 |
return super(kwfilelog, self).add(text, meta, tr, link, p1 |
|
|
244 | return super(kwfilelog, self).add(text, meta, tr, link, p1, p2) | |
|
245 | 245 | |
|
246 | 246 | def cmp(self, node, text): |
|
247 | 247 | '''Removes keyword substitutions for comparison.''' |
@@ -302,7 +302,7 b' def demo(ui, repo, *args, **opts):' | |||
|
302 | 302 | branchname = 'demobranch' |
|
303 | 303 | tmpdir = tempfile.mkdtemp('', 'kwdemo.') |
|
304 | 304 | ui.note(_('creating temporary repo at %s\n') % tmpdir) |
|
305 |
repo = localrepo.localrepository(ui, |
|
|
305 | repo = localrepo.localrepository(ui, tmpdir, True) | |
|
306 | 306 | ui.setconfig('keyword', fn, '') |
|
307 | 307 | if args or opts.get('rcfile'): |
|
308 | 308 | kwstatus = 'custom' |
@@ -481,20 +481,17 b' def reposetup(ui, repo):' | |||
|
481 | 481 | else: |
|
482 | 482 | _p2 = hex(_p2) |
|
483 | 483 | |
|
484 | node = super(kwrepo, | |
|
485 | self).commit(files=files, text=text, user=user, | |
|
486 |
|
|
|
487 | force_editor=force_editor, | |
|
488 | p1=p1, p2=p2, extra=extra, | |
|
489 | empty_ok=empty_ok) | |
|
484 | n = super(kwrepo, self).commit(files, text, user, date, match, | |
|
485 | force, force_editor, p1, p2, | |
|
486 | extra, empty_ok) | |
|
490 | 487 | |
|
491 | 488 | # restore commit hooks |
|
492 | 489 | for name, cmd in commithooks.iteritems(): |
|
493 | 490 | ui.setconfig('hooks', name, cmd) |
|
494 |
if n |
|
|
495 |
kwt.overwrite(node=n |
|
|
496 |
repo.hook('commit', node=n |
|
|
497 |
return n |
|
|
491 | if n is not None: | |
|
492 | kwt.overwrite(node=n) | |
|
493 | repo.hook('commit', node=n, parent1=_p1, parent2=_p2) | |
|
494 | return n | |
|
498 | 495 | finally: |
|
499 | 496 | del wlock, lock |
|
500 | 497 | |
@@ -502,7 +499,7 b' def reposetup(ui, repo):' | |||
|
502 | 499 | def kwpatchfile_init(self, ui, fname, missing=False): |
|
503 | 500 | '''Monkeypatch/wrap patch.patchfile.__init__ to avoid |
|
504 | 501 | rejects or conflicts due to expanded keywords in working dir.''' |
|
505 |
patchfile_init(self, ui, fname, missing |
|
|
502 | patchfile_init(self, ui, fname, missing) | |
|
506 | 503 | # shrink keywords read from working dir |
|
507 | 504 | self.lines = kwt.shrinklines(self.fname, self.lines) |
|
508 | 505 | |
@@ -514,8 +511,7 b' def reposetup(ui, repo):' | |||
|
514 | 511 | kwt.matcher = util.never |
|
515 | 512 | elif node1 is not None and node1 != repo.changectx().node(): |
|
516 | 513 | kwt.restrict = True |
|
517 |
patch_diff(repo, node1 |
|
|
518 | fp=fp, changes=changes, opts=opts) | |
|
514 | patch_diff(repo, node1, node2, files, match, fp, changes, opts) | |
|
519 | 515 | |
|
520 | 516 | def kwweb_changeset(web, req, tmpl): |
|
521 | 517 | '''Wraps webcommands.changeset turning off keyword expansion.''' |
General Comments 0
You need to be logged in to leave comments.
Login now