Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/template-vars.txt @ 190:3dd5ce2fddb6
merge: short-circuit search for merge into empty repo
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
merge: short-circuit search for merge into empty repo
We should have 3 cases for merge:
- - we have no changesets
- - we have less than half the changesets
- - we have more than half the changesets
For no changesets, we can immediately tell that we need everything.
This happens when we initially branch from a remote repo, so we simply shortcircuit the search and grab everything from the root
When we're actually tracking a project, we should generally have most
of the changesets, so the current search algorithm should minimize
searching.
It should rarely occur that upstreams gets far ahead of us, in which
case, we suffer a longer search.
manifest hash: eabd55841b03225176ea72b985aad36431a438a9
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCmfajywK+sNU5EO8RAuyKAKCf7Nw6XSK5HEzbrZae7Q06e3dk4wCgjbK6
YUTEfkpPP1h3mNHIHRKz+aI=
=eGMq
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Sun, 29 May 2005 09:06:43 -0800 |
parents | c77a679e9cfa |
children | f8d44a2e6928 |
rev | line source |
---|---|
138 | 1 repo the name of the repo |
2 rev a changeset.manifest revision | |
3 node a changeset node | |
4 changesets total number of changesets | |
5 file a filename | |
6 filenode a file node | |
7 filerev a file revision | |
8 filerevs total number of file revisions | |
9 up the directory of the relevant file | |
10 path a path in the manifest, starting with "/" | |
11 basename a short pathname | |
12 manifest a manifest node | |
13 manifestrev a manifest revision | |
14 date a date string | |
15 age age in hours, days, etc | |
16 line a line of text (escaped) | |
17 desc a description (escaped, with breaks) | |
18 shortdesc a short description (escaped) | |
19 author a name or email addressv(obfuscated) | |
20 p1, p2 parent nodes | |
21 p1rev, p2rev parent revs | |
22 | |
23 header the global page header | |
24 footer the global page footer | |
25 | |
26 files a list of file links | |
27 dirs a set of directory links | |
28 diff a diff of one or more files | |
29 annotate an annotated file | |
30 entries the entries relevant to the page | |
31 | |
32 Templates and commands: | |
33 changelog(rev) - a page for browsing changesets | |
34 naventry - a link for jumping to a changeset number | |
35 filenodelink - jump to file diff | |
36 fileellipses - printed after maxfiles | |
37 changelogentry - an entry in the log | |
38 manifest - browse a manifest as a directory tree |