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

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

show: use consistent (and possibly shorter) node lengths...
show: use consistent (and possibly shorter) node lengths `hg show` makes heavy use of shortest() to limit the length of the node hash. For the "stack" and "work" views, you are often looking at multiple lines of similar output for "lines" of work. It is visually appeasing for things to vertically align. A naive use of {shortest(node, N)} could result in variable length nodes and for the first character of the description to vary by a column or two. We implement a function to determine the longest shortest prefix for a set of revisions. The new function is used to determine the printed node length for all `hg show` views. .. feature:: show: use consistent node length in views Our previous shortest node length of 5 was arbitrarily chosen. shortest() already does the work of ensuring that a partial node isn't ambiguous with an integer revision, which is our primary risk of a collision for very short nodes. It should be safe to go with the shortest node possible. Existing code is also optimized to handle nodes as short as 4. So, we decrease the minimum hash length from 5 to 4. We also add a test demonstrating that prefix collisions increase the node length. .. feature:: show: decrease minimum displayed hash length from 5 to 4 Differential Revision: https://phab.mercurial-scm.org/D558
Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default
r34192:e6b5e732 default
Show More
test-merge-closedheads.t
87 lines | 2.2 KiB | text/troff | Tads3Lexer
/ tests / test-merge-closedheads.t
History | Annotation | Raw |Copy content |Copy permalink
$ hgcommit() {
> hg commit -u user "$@"
> }
$ hg init clhead
$ cd clhead
$ touch foo && hg add && hgcommit -m 'foo'
adding foo
$ touch bar && hg add && hgcommit -m 'bar'
adding bar
$ touch baz && hg add && hgcommit -m 'baz'
adding baz
$ echo "flub" > foo
$ hgcommit -m "flub"
$ echo "nub" > foo
$ hgcommit -m "nub"
$ hg up -C 2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo "c1" > c1
$ hg add c1
$ hgcommit -m "c1"
created new head
$ echo "c2" > c1
$ hgcommit -m "c2"
$ hg up -C 2
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo "d1" > d1
$ hg add d1
$ hgcommit -m "d1"
created new head
$ echo "d2" > d1
$ hgcommit -m "d2"
$ hg tag -l good
fail with three heads
$ hg up -C good
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge
abort: branch 'default' has 3 heads - please merge with an explicit rev
(run 'hg heads .' to see heads)
[255]
close one of the heads
$ hg up -C 6
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hgcommit -m 'close this head' --close-branch
succeed with two open heads
$ hg up -C good
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg up -C good
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hgcommit -m 'merged heads'
hg update -C 8
$ hg update -C 8
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
hg branch some-branch
$ hg branch some-branch
marked working directory as branch some-branch
(branches are permanent and global, did you want a bookmark?)
hg commit
$ hgcommit -m 'started some-branch'
hg commit --close-branch
$ hgcommit --close-branch -m 'closed some-branch'
hg update default
$ hg update default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
hg merge some-branch
$ hg merge some-branch
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
hg commit (no reopening of some-branch)
$ hgcommit -m 'merge with closed branch'
$ cd ..