##// END OF EJS Templates
strip: move bookmarks to nearest ancestor rather than '.'...
strip: move bookmarks to nearest ancestor rather than '.' If you've got this graph: 0-1-2 \ 3 and 3 is checked out, 2 is bookmarked with "broken", and you do "hg strip 2", the bookmark will move to 3, not 1. That's always struck me as a bug. This change makes bookmarks move to the tipmost ancestor of the stripped set rather than the currently-checked-out revision, which is what I always expected should happen.

File last commit:

r16913:f2719b38 default
r17264:ec7b9bec stable
Show More
test-diffstat.t
72 lines | 1.4 KiB | text/troff | Tads3Lexer
Adrian Buehlmann
tests: unify test-diffstat
r12147 $ hg init repo
$ cd repo
$ i=0; while [ "$i" -lt 213 ]; do echo a >> a; i=`expr $i + 1`; done
$ hg add a
Steven Brown
patch: restore the previous output of 'diff --stat'...
r14437 $ cp a b
$ hg add b
Adrian Buehlmann
tests: unify test-diffstat
r12147
Wide diffstat:
$ hg diff --stat
a | 213 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Steven Brown
patch: restore the previous output of 'diff --stat'...
r14437 b | 213 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 426 insertions(+), 0 deletions(-)
Adrian Buehlmann
tests: unify test-diffstat
r12147
diffstat width:
$ COLUMNS=24 hg diff --config ui.interactive=true --stat
a | 213 ++++++++++++++
Steven Brown
patch: restore the previous output of 'diff --stat'...
r14437 b | 213 ++++++++++++++
2 files changed, 426 insertions(+), 0 deletions(-)
Adrian Buehlmann
tests: unify test-diffstat
r12147
$ hg ci -m adda
$ cat >> a <<EOF
> a
> a
> a
> EOF
Narrow diffstat:
$ hg diff --stat
a | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
$ hg ci -m appenda
Jim Hague
tests: tighten checks for octal escapes in shell printf....
r16098 >>> open("c", "wb").write("\0")
Patrick Mezard
diffstat: be more picky when marking file as 'binary' (issue2816)...
r15363 $ touch d
$ hg add c d
Adrian Buehlmann
tests: unify test-diffstat
r12147
Binary diffstat:
$ hg diff --stat
Patrick Mezard
diffstat: be more picky when marking file as 'binary' (issue2816)...
r15363 c | Bin
Adrian Buehlmann
tests: unify test-diffstat
r12147 1 files changed, 0 insertions(+), 0 deletions(-)
Binary git diffstat:
$ hg diff --stat --git
Steven Brown
patch: restore the previous output of 'diff --stat'...
r14437 c | Bin
Patrick Mezard
diffstat: be more picky when marking file as 'binary' (issue2816)...
r15363 d | 0
2 files changed, 0 insertions(+), 0 deletions(-)
Adrian Buehlmann
tests: unify test-diffstat
r12147
Gastón Kleiman
diffstat: fix parsing of filenames with spaces...
r13395 $ hg ci -m createb
Jim Hague
tests: tighten checks for octal escapes in shell printf....
r16098 >>> open("file with spaces", "wb").write("\0")
Gastón Kleiman
diffstat: fix parsing of filenames with spaces...
r13395 $ hg add "file with spaces"
Filename with spaces diffstat:
$ hg diff --stat
Patrick Mezard
diffstat: be more picky when marking file as 'binary' (issue2816)...
r15363 file with spaces | Bin
Gastón Kleiman
diffstat: fix parsing of filenames with spaces...
r13395 1 files changed, 0 insertions(+), 0 deletions(-)
Filename with spaces git diffstat:
$ hg diff --stat --git
file with spaces | Bin
1 files changed, 0 insertions(+), 0 deletions(-)
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913 $ cd ..