##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

merge: don't report progress for dr/rd actions...
merge: don't report progress for dr/rd actions It is easier to reason about certain algorithms in terms of a file->action mapping than the current action->list-of-files. Bid merge is already written this way (but with a list of actions per file), and largefiles' overridecalculateupdates() will also benefit. However, that requires us to have at most one action per file. That requirement is currently violated by 'dr' (divergent rename) and 'rd' (rename and delete) actions, which can exist for the same file as some other action. These actions are only used for displaying warnings to the user; they don't change anything in the working copy or the dirstate. In this way, they are similar to the 'k' (keep) action. However, they are even less action-like than 'k' is: 'k' at least describes what to do with the file ("do nothing"), while 'dr' and 'rd' or only annotations for files for which there may exist other, "real" actions. As a first step towards separating these acitons out, stop including them in the progress output, just like we already exclude the 'k' action.
Siddharth Agarwal - - Load All Authors

File last commit:

r18081:f88c60e7 default
r23524:a1a7c94d default
Show More
test-revlog-ancestry.py.out
19 lines | 298 B | text/plain | TextLexer
/ tests / test-revlog-ancestry.py.out
History | Source | Raw |Copy content |Copy permalink
Stefano Tortarolo
Add ancestors and descendants to revlog...
 r6872 Ancestors of 5
4 2 0
Ancestors of 6 and 5
3 4 2 1 0
Ancestors of 5 and 4
4 2 0
Joshua Redstone
revlog: add optional stoprev arg to revlog.ancestors()...
 r16868 Ancestors of 7, stop at 6
6
Siddharth Agarwal
revlog.ancestors: add support for including revs...
 r18081 Ancestors of 7, including revs
7 6 5 3 4 2 1 0
Ancestors of 7, 5 and 3, including revs
7 5 3 6 4 2 1 0
Stefano Tortarolo
Add ancestors and descendants to revlog...
 r6872
Descendants of 5
7 8
Descendants of 5 and 3
6 7 8
Descendants of 5 and 4
5 7 8