view templates/template-vars.txt @ 5096:ad6b97132b81

merge: fix a copy detection bug (issue672)

When merging rev1 and rev2, we want to search for copies that happened
in rev1 but not in rev2 and vice-versa.  We were starting the search at
rev1/rev2 and then going back, stopping as soon as we reached the revno
of the ancestor, but that can miss some cases (see the new
test-issue672).

Now we calculate the revisions that are ancestors of rev1 or rev2 (but
not both) and make sure the search doesn't stop too early.

Simplified test provided by mpm, based on a test case provided by
Edward Lee.

repo          the name of the repo
rev           a changeset.manifest revision
node          a changeset node
changesets    total number of changesets
file          a filename
filerev       a file revision
filerevs      total number of file revisions
up            the directory of the relevant file
path          a path in the manifest, starting with "/"
basename      a short pathname
date          a date string
age           age in hours, days, etc
line          a line of text (escaped)
desc          a description (escaped, with breaks)
shortdesc     a short description (escaped)
author        a name or email addressv(obfuscated)
parent        a list of the parent
child         a list of the children
tags          a list of tag

header        the global page header
footer        the global page footer

files         a list of file links
file_copies   a list of pairs of name, source filenames
dirs          a set of directory links
diff          a diff of one or more files
annotate      an annotated file
entries       the entries relevant to the page

Templates and commands:
  changelog(rev) - a page for browsing changesets
    naventry - a link for jumping to a changeset number
    filenodelink - jump to file diff
    fileellipses - printed after maxfiles
    changelogentry - an entry in the log
  manifest - browse a manifest as a directory tree