##// END OF EJS Templates
linelog: add a Python implementation of the linelog datastructure...
linelog: add a Python implementation of the linelog datastructure This datastructure was originally developed by Jun Wu at Facebook, inspired by SCCS weaves. It's useful as a cache for blame information, but also is the magic that makes `hg absorb` easy to implement. In service of importing the code to Mercurial, I wanted to actually /understand/ it, and once I did I decided to take a run at implementing it. The help/internals/linelog.txt document is the README from Jun Wu's implementaiton. It all applies to our linelog implementation. Differential Revision: https://phab.mercurial-scm.org/D3990

File last commit:

r37939:ea63a200 default
r38819:752d858a default
Show More
test-log.t
2637 lines | 57.7 KiB | text/troff | Tads3Lexer
Alexander Plavin
log: fix behavior with empty repositories (issue3497)...
r18991 Log on empty repository: checking consistency
$ hg init empty
$ cd empty
$ hg log
$ hg log -r 1
abort: unknown revision '1'!
[255]
$ hg log -r -1:0
abort: unknown revision '-1'!
[255]
$ hg log -r 'branch(name)'
abort: unknown revision 'name'!
[255]
$ hg log -r null -q
-1:000000000000
Denis Laxalde
tests: change to parent directory before all "hg init" in test-log.t...
r34456 $ cd ..
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 The g is crafted to have 2 filelog topological heads in a linear
changeset graph
Nicolas Dumazet
tests: unify test-log
r11900 $ hg init a
$ cd a
$ echo a > a
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 $ echo f > f
Nicolas Dumazet
tests: unify test-log
r11900 $ hg ci -Ama -d '1 0'
adding a
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 adding f
Nicolas Dumazet
tests: unify test-log
r11900
$ hg cp a b
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 $ hg cp f g
Nicolas Dumazet
tests: unify test-log
r11900 $ hg ci -mb -d '2 0'
$ mkdir dir
$ hg mv b dir
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 $ echo g >> g
$ echo f >> f
Nicolas Dumazet
tests: unify test-log
r11900 $ hg ci -mc -d '3 0'
$ hg mv a b
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 $ hg cp -f f g
Nicolas Dumazet
tests: unify test-log
r11900 $ echo a > d
$ hg add d
$ hg ci -md -d '4 0'
$ hg mv dir/b e
$ hg ci -me -d '5 0'
Matt Harbison
largefiles: don't interfere with logging normal files...
r23976 Make sure largefiles doesn't interfere with logging a regular file
Matt Harbison
largefiles: don't prefix standin patterns with '.hglf' when logging...
r24207 $ hg --debug log a -T '{rev}: {desc}\n' --config extensions.largefiles=
FUJIWARA Katsunori
tests: add fsmonitor specific output lines at enabling largefiles...
r33209 The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
Pulkit Goyal
py3: explicitly convert a list to bytes to pass in ui.debug...
r32308 updated patterns: .hglf/a, a
Matt Harbison
largefiles: don't prefix standin patterns with '.hglf' when logging...
r24207 0: a
Nicolas Dumazet
tests: unify test-log
r11900 $ hg log a
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 changeset: 0:9161b9aeaf16
Nicolas Dumazet
tests: unify test-log
r11900 user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: a
Matt Harbison
largefiles: teach log to handle patterns...
r24206 $ hg log glob:a*
changeset: 3:2ca5ba701980
user: test
date: Thu Jan 01 00:00:04 1970 +0000
summary: d
changeset: 0:9161b9aeaf16
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: a
Matt Harbison
largefiles: don't prefix standin patterns with '.hglf' when logging...
r24207 $ hg --debug log glob:a* -T '{rev}: {desc}\n' --config extensions.largefiles=
FUJIWARA Katsunori
tests: add fsmonitor specific output lines at enabling largefiles...
r33209 The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
Pulkit Goyal
py3: explicitly convert a list to bytes to pass in ui.debug...
r32308 updated patterns: glob:.hglf/a*, glob:a*
Matt Harbison
largefiles: don't prefix standin patterns with '.hglf' when logging...
r24207 3: d
0: a
Mads Kiilerich
log: make log work even if first parameter doesn't exist...
r18340 log on directory
$ hg log dir
changeset: 4:7e4639b4691b
tag: tip
user: test
date: Thu Jan 01 00:00:05 1970 +0000
summary: e
changeset: 2:f8954cd4dc1f
user: test
date: Thu Jan 01 00:00:03 1970 +0000
summary: c
$ hg log somethingthatdoesntexist dir
changeset: 4:7e4639b4691b
tag: tip
user: test
date: Thu Jan 01 00:00:05 1970 +0000
summary: e
changeset: 2:f8954cd4dc1f
user: test
date: Thu Jan 01 00:00:03 1970 +0000
summary: c
Nicolas Dumazet
tests: unify test-log
r11900
Yuya Nishihara
match: do not weirdly include explicit files excluded by -X option...
r35677 -X, with explicit path
$ hg log a -X a
Durham Goode
log: allow patterns with -f...
r21998 -f, non-existent directory
Nicolas Dumazet
tests: unify test-log
r11900
$ hg log -f dir
Patrick Mezard
log: fix --follow FILE ancestry calculation...
r16165 abort: cannot follow file not in parent revision: "dir"
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Nicolas Dumazet
tests: unify test-log
r11900
Durham Goode
log: allow patterns with -f...
r21998 -f, directory
$ hg up -q 3
$ hg log -f dir
changeset: 2:f8954cd4dc1f
user: test
date: Thu Jan 01 00:00:03 1970 +0000
summary: c
-f, directory with --patch
$ hg log -f dir -p
changeset: 2:f8954cd4dc1f
user: test
date: Thu Jan 01 00:00:03 1970 +0000
summary: c
diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
--- /dev/null* (glob)
+++ b/dir/b* (glob)
@@ -0,0 +1,1 @@
+a
-f, pattern
$ hg log -f -I 'dir**' -p
changeset: 2:f8954cd4dc1f
user: test
date: Thu Jan 01 00:00:03 1970 +0000
summary: c
diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
--- /dev/null* (glob)
+++ b/dir/b* (glob)
@@ -0,0 +1,1 @@
+a
$ hg up -q 4
Iulian Stana
templater: show the style list when I try to use a wrong one...
r19125 -f, a wrong style
$ hg log -f -l1 --style something
abort: style 'something' not found
Gregory Szorc
show: new extension for displaying various repository data...
r31765 (available styles: bisect, changelog, compact, default, phases, show, status, xml)
Iulian Stana
templater: show the style list when I try to use a wrong one...
r19125 [255]
Iulian Stana
log-style: add a log style that is default+phase (issue3436)...
r19126 -f, phases style
$ hg log -f -l1 --style phases
changeset: 4:7e4639b4691b
tag: tip
phase: draft
user: test
date: Thu Jan 01 00:00:05 1970 +0000
summary: e
Iulian Stana
templater: show the style list when I try to use a wrong one...
r19125
Yuya Nishihara
templates: fix "log -q" output of phases style...
r24493 $ hg log -f -l1 --style phases -q
4:7e4639b4691b
Nicolas Dumazet
tests: unify test-log
r11900 -f, but no args
$ hg log -f
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 changeset: 4:7e4639b4691b
Nicolas Dumazet
tests: unify test-log
r11900 tag: tip
user: test
date: Thu Jan 01 00:00:05 1970 +0000
summary: e
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 changeset: 3:2ca5ba701980
Nicolas Dumazet
tests: unify test-log
r11900 user: test
date: Thu Jan 01 00:00:04 1970 +0000
summary: d
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 changeset: 2:f8954cd4dc1f
Nicolas Dumazet
tests: unify test-log
r11900 user: test
date: Thu Jan 01 00:00:03 1970 +0000
summary: c
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 changeset: 1:d89b0a12d229
Nicolas Dumazet
tests: unify test-log
r11900 user: test
date: Thu Jan 01 00:00:02 1970 +0000
summary: b
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 changeset: 0:9161b9aeaf16
Nicolas Dumazet
tests: unify test-log
r11900 user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: a
one rename
Patrick Mezard
log: fix --follow FILE ancestry calculation...
r16165 $ hg up -q 2
Nicolas Dumazet
tests: unify test-log
r11900 $ hg log -vf a
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 changeset: 0:9161b9aeaf16
Nicolas Dumazet
tests: unify test-log
r11900 user: test
date: Thu Jan 01 00:00:01 1970 +0000
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 files: a f
Nicolas Dumazet
tests: unify test-log
r11900 description:
a
many renames
Patrick Mezard
log: fix --follow FILE ancestry calculation...
r16165 $ hg up -q tip
Nicolas Dumazet
tests: unify test-log
r11900 $ hg log -vf e
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 changeset: 4:7e4639b4691b
Nicolas Dumazet
tests: unify test-log
r11900 tag: tip
user: test
date: Thu Jan 01 00:00:05 1970 +0000
files: dir/b e
description:
e
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 changeset: 2:f8954cd4dc1f
Nicolas Dumazet
tests: unify test-log
r11900 user: test
date: Thu Jan 01 00:00:03 1970 +0000
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 files: b dir/b f g
Nicolas Dumazet
tests: unify test-log
r11900 description:
c
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 changeset: 1:d89b0a12d229
Nicolas Dumazet
tests: unify test-log
r11900 user: test
date: Thu Jan 01 00:00:02 1970 +0000
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 files: b g
Nicolas Dumazet
tests: unify test-log
r11900 description:
b
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 changeset: 0:9161b9aeaf16
Nicolas Dumazet
tests: unify test-log
r11900 user: test
date: Thu Jan 01 00:00:01 1970 +0000
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 files: a f
Nicolas Dumazet
tests: unify test-log
r11900 description:
a
log -pf dir/b
Patrick Mezard
log: fix --follow FILE ancestry calculation...
r16165 $ hg up -q 3
Nicolas Dumazet
tests: unify test-log
r11900 $ hg log -pf dir/b
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 changeset: 2:f8954cd4dc1f
Nicolas Dumazet
tests: unify test-log
r11900 user: test
date: Thu Jan 01 00:00:03 1970 +0000
summary: c
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
Nicolas Dumazet
tests: unify test-log
r11900 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/dir/b Thu Jan 01 00:00:03 1970 +0000
@@ -0,0 +1,1 @@
+a
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 changeset: 1:d89b0a12d229
Nicolas Dumazet
tests: unify test-log
r11900 user: test
date: Thu Jan 01 00:00:02 1970 +0000
summary: b
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 diff -r 9161b9aeaf16 -r d89b0a12d229 b
Nicolas Dumazet
tests: unify test-log
r11900 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/b Thu Jan 01 00:00:02 1970 +0000
@@ -0,0 +1,1 @@
+a
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 changeset: 0:9161b9aeaf16
Nicolas Dumazet
tests: unify test-log
r11900 user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: a
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 diff -r 000000000000 -r 9161b9aeaf16 a
Nicolas Dumazet
tests: unify test-log
r11900 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/a Thu Jan 01 00:00:01 1970 +0000
@@ -0,0 +1,1 @@
+a
Siddharth Agarwal
log: make --patch --follow work inside a subdirectory...
r21876 log -pf b inside dir
$ hg --cwd=dir log -pf b
changeset: 2:f8954cd4dc1f
user: test
date: Thu Jan 01 00:00:03 1970 +0000
summary: c
diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/dir/b Thu Jan 01 00:00:03 1970 +0000
@@ -0,0 +1,1 @@
+a
changeset: 1:d89b0a12d229
user: test
date: Thu Jan 01 00:00:02 1970 +0000
summary: b
diff -r 9161b9aeaf16 -r d89b0a12d229 b
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/b Thu Jan 01 00:00:02 1970 +0000
@@ -0,0 +1,1 @@
+a
changeset: 0:9161b9aeaf16
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: a
diff -r 000000000000 -r 9161b9aeaf16 a
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/a Thu Jan 01 00:00:01 1970 +0000
@@ -0,0 +1,1 @@
+a
Yuya Nishihara
log: do not use exact matcher for --patch --follow without file (issue4319)...
r21966 log -pf, but no args
$ hg log -pf
changeset: 3:2ca5ba701980
user: test
date: Thu Jan 01 00:00:04 1970 +0000
summary: d
diff -r f8954cd4dc1f -r 2ca5ba701980 a
--- a/a Thu Jan 01 00:00:03 1970 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-a
diff -r f8954cd4dc1f -r 2ca5ba701980 b
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/b Thu Jan 01 00:00:04 1970 +0000
@@ -0,0 +1,1 @@
+a
diff -r f8954cd4dc1f -r 2ca5ba701980 d
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/d Thu Jan 01 00:00:04 1970 +0000
@@ -0,0 +1,1 @@
+a
diff -r f8954cd4dc1f -r 2ca5ba701980 g
--- a/g Thu Jan 01 00:00:03 1970 +0000
+++ b/g Thu Jan 01 00:00:04 1970 +0000
@@ -1,2 +1,2 @@
f
-g
+f
changeset: 2:f8954cd4dc1f
user: test
date: Thu Jan 01 00:00:03 1970 +0000
summary: c
diff -r d89b0a12d229 -r f8954cd4dc1f b
--- a/b Thu Jan 01 00:00:02 1970 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-a
diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/dir/b Thu Jan 01 00:00:03 1970 +0000
@@ -0,0 +1,1 @@
+a
diff -r d89b0a12d229 -r f8954cd4dc1f f
--- a/f Thu Jan 01 00:00:02 1970 +0000
+++ b/f Thu Jan 01 00:00:03 1970 +0000
@@ -1,1 +1,2 @@
f
+f
diff -r d89b0a12d229 -r f8954cd4dc1f g
--- a/g Thu Jan 01 00:00:02 1970 +0000
+++ b/g Thu Jan 01 00:00:03 1970 +0000
@@ -1,1 +1,2 @@
f
+g
changeset: 1:d89b0a12d229
user: test
date: Thu Jan 01 00:00:02 1970 +0000
summary: b
diff -r 9161b9aeaf16 -r d89b0a12d229 b
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/b Thu Jan 01 00:00:02 1970 +0000
@@ -0,0 +1,1 @@
+a
diff -r 9161b9aeaf16 -r d89b0a12d229 g
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/g Thu Jan 01 00:00:02 1970 +0000
@@ -0,0 +1,1 @@
+f
changeset: 0:9161b9aeaf16
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: a
diff -r 000000000000 -r 9161b9aeaf16 a
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/a Thu Jan 01 00:00:01 1970 +0000
@@ -0,0 +1,1 @@
+a
diff -r 000000000000 -r 9161b9aeaf16 f
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/f Thu Jan 01 00:00:01 1970 +0000
@@ -0,0 +1,1 @@
+f
Nicolas Dumazet
tests: unify test-log
r11900 log -vf dir/b
$ hg log -vf dir/b
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 changeset: 2:f8954cd4dc1f
Nicolas Dumazet
tests: unify test-log
r11900 user: test
date: Thu Jan 01 00:00:03 1970 +0000
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 files: b dir/b f g
Nicolas Dumazet
tests: unify test-log
r11900 description:
c
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 changeset: 1:d89b0a12d229
Nicolas Dumazet
tests: unify test-log
r11900 user: test
date: Thu Jan 01 00:00:02 1970 +0000
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 files: b g
Nicolas Dumazet
tests: unify test-log
r11900 description:
b
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 changeset: 0:9161b9aeaf16
Nicolas Dumazet
tests: unify test-log
r11900 user: test
date: Thu Jan 01 00:00:01 1970 +0000
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 files: a f
Nicolas Dumazet
tests: unify test-log
r11900 description:
a
Patrick Mezard
log: fix --follow FILE ancestry calculation...
r16165 -f and multiple filelog heads
$ hg up -q 2
$ hg log -f g --template '{rev}\n'
2
1
0
$ hg up -q tip
$ hg log -f g --template '{rev}\n'
3
2
0
Yuya Nishihara
log: follow file history across copies even with -rREV (BC) (issue4959)...
r35705 follow files from the specified revisions (issue4959)
$ hg log -G -T '{rev} {files},{file_copies % " {source}->{name}"}\n'
@ 4 dir/b e, dir/b->e
|
o 3 a b d g, a->b f->g
|
o 2 b dir/b f g, b->dir/b
|
o 1 b g, a->b f->g
|
o 0 a f,
$ hg log -T '{rev}\n' -fr 4 e
4
2
1
0
$ hg log -T '{rev}\n' -fr 2 g
2
1
0
$ hg log -T '{rev}\n' -fr '2+3' g
3
2
1
0
follow files from the specified revisions with glob patterns (issue5053)
(BROKEN: should follow copies from e@4)
$ hg log -T '{rev}\n' -fr4 e -X '[abcdfg]'
4
2 (false !)
1 (false !)
0 (false !)
follow files from the specified revisions with missing patterns
(BROKEN: should follow copies from e@4)
$ hg log -T '{rev}\n' -fr4 e x
4
2 (false !)
1 (false !)
0 (false !)
follow files from the specified revisions across copies with -p/--patch
$ hg log -T '== rev: {rev},{file_copies % " {source}->{name}"} ==\n' -fpr 4 e g
== rev: 4, dir/b->e ==
diff -r 2ca5ba701980 -r 7e4639b4691b e
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/e Thu Jan 01 00:00:05 1970 +0000
@@ -0,0 +1,1 @@
+a
== rev: 3, a->b f->g ==
diff -r f8954cd4dc1f -r 2ca5ba701980 g
--- a/g Thu Jan 01 00:00:03 1970 +0000
+++ b/g Thu Jan 01 00:00:04 1970 +0000
@@ -1,2 +1,2 @@
f
-g
+f
== rev: 2, b->dir/b ==
diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/dir/b Thu Jan 01 00:00:03 1970 +0000
@@ -0,0 +1,1 @@
+a
diff -r d89b0a12d229 -r f8954cd4dc1f f
--- a/f Thu Jan 01 00:00:02 1970 +0000
+++ b/f Thu Jan 01 00:00:03 1970 +0000
@@ -1,1 +1,2 @@
f
+f
== rev: 1, a->b f->g ==
diff -r 9161b9aeaf16 -r d89b0a12d229 b
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/b Thu Jan 01 00:00:02 1970 +0000
@@ -0,0 +1,1 @@
+a
== rev: 0, ==
diff -r 000000000000 -r 9161b9aeaf16 a
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/a Thu Jan 01 00:00:01 1970 +0000
@@ -0,0 +1,1 @@
+a
diff -r 000000000000 -r 9161b9aeaf16 f
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/f Thu Jan 01 00:00:01 1970 +0000
@@ -0,0 +1,1 @@
+f
Patrick Mezard
log: fix --follow FILE ancestry calculation...
r16165
Nicolas Dumazet
tests: unify test-log
r11900 log copies with --copies
$ hg log -vC --template '{rev} {file_copies}\n'
4 e (dir/b)
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 3 b (a)g (f)
Nicolas Dumazet
tests: unify test-log
r11900 2 dir/b (b)
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 1 b (a)g (f)
Nicolas Dumazet
tests: unify test-log
r11900 0
log copies switch without --copies, with old filecopy template
$ hg log -v --template '{rev} {file_copies_switch%filecopy}\n'
4
3
2
1
0
log copies switch with --copies
$ hg log -vC --template '{rev} {file_copies_switch}\n'
4 e (dir/b)
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 3 b (a)g (f)
Nicolas Dumazet
tests: unify test-log
r11900 2 dir/b (b)
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 1 b (a)g (f)
Nicolas Dumazet
tests: unify test-log
r11900 0
log copies with hardcoded style and with --style=default
$ hg log -vC -r4
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 changeset: 4:7e4639b4691b
Nicolas Dumazet
tests: unify test-log
r11900 tag: tip
user: test
date: Thu Jan 01 00:00:05 1970 +0000
files: dir/b e
copies: e (dir/b)
description:
e
$ hg log -vC -r4 --style=default
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 changeset: 4:7e4639b4691b
Nicolas Dumazet
tests: unify test-log
r11900 tag: tip
user: test
date: Thu Jan 01 00:00:05 1970 +0000
files: dir/b e
copies: e (dir/b)
description:
e
Augie Fackler
log: fix json-formatted output when file copies are listed (issue4523)
r24013 $ hg log -vC -r4 -Tjson
[
{
Yuya Nishihara
logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter...
r37790 "bookmarks": [],
Augie Fackler
log: fix json-formatted output when file copies are listed (issue4523)
r24013 "branch": "default",
Yuya Nishihara
logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter...
r37790 "copies": {"e": "dir/b"},
Augie Fackler
log: fix json-formatted output when file copies are listed (issue4523)
r24013 "date": [5, 0],
"desc": "e",
Yuya Nishihara
logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter...
r37790 "files": ["dir/b", "e"],
"node": "7e4639b4691b9f84b81036a8d4fb218ce3c5e3a3",
Augie Fackler
log: fix json-formatted output when file copies are listed (issue4523)
r24013 "parents": ["2ca5ba7019804f1f597249caddf22a64d34df0ba"],
Yuya Nishihara
logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter...
r37790 "phase": "draft",
"rev": 4,
"tags": ["tip"],
"user": "test"
Augie Fackler
log: fix json-formatted output when file copies are listed (issue4523)
r24013 }
]
Nicolas Dumazet
tests: unify test-log
r11900
log copies, non-linear manifest
$ hg up -C 3
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg mv dir/b e
$ echo foo > foo
$ hg ci -Ame2 -d '6 0'
adding foo
created new head
$ hg log -v --template '{rev} {file_copies}\n' -r 5
5 e (dir/b)
log copies, execute bit set
Adrian Buehlmann
test-log: enable for Windows
r16887 #if execbit
Nicolas Dumazet
tests: unify test-log
r11900 $ chmod +x e
$ hg ci -me3 -d '7 0'
$ hg log -v --template '{rev} {file_copies}\n' -r 6
6
Adrian Buehlmann
test-log: enable for Windows
r16887 #endif
Nicolas Dumazet
tests: unify test-log
r11900
Yuya Nishihara
log: fix crash on empty revision with --copies switch...
r37794 log copies, empty set
$ hg log --copies -r '0 and not 0'
Nicolas Dumazet
tests: unify test-log
r11900
log -p d
$ hg log -pv d
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 changeset: 3:2ca5ba701980
Nicolas Dumazet
tests: unify test-log
r11900 user: test
date: Thu Jan 01 00:00:04 1970 +0000
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 files: a b d g
Nicolas Dumazet
tests: unify test-log
r11900 description:
d
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 diff -r f8954cd4dc1f -r 2ca5ba701980 d
Nicolas Dumazet
tests: unify test-log
r11900 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/d Thu Jan 01 00:00:04 1970 +0000
@@ -0,0 +1,1 @@
+a
log --removed file
$ hg log --removed -v a
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 changeset: 3:2ca5ba701980
Nicolas Dumazet
tests: unify test-log
r11900 user: test
date: Thu Jan 01 00:00:04 1970 +0000
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 files: a b d g
Nicolas Dumazet
tests: unify test-log
r11900 description:
d
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 changeset: 0:9161b9aeaf16
Nicolas Dumazet
tests: unify test-log
r11900 user: test
date: Thu Jan 01 00:00:01 1970 +0000
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 files: a f
Nicolas Dumazet
tests: unify test-log
r11900 description:
a
log --removed revrange file
$ hg log --removed -v -r0:2 a
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 changeset: 0:9161b9aeaf16
Nicolas Dumazet
tests: unify test-log
r11900 user: test
date: Thu Jan 01 00:00:01 1970 +0000
Patrick Mezard
test-glog: extend a test before fixing --follow issues...
r16164 files: a f
Nicolas Dumazet
tests: unify test-log
r11900 description:
a
Mads Kiilerich
tests: cleanup of tests that got lost in their own nested directories...
r16912 $ cd ..
Nicolas Dumazet
tests: unify test-log
r11900
log --follow tests
Mads Kiilerich
tests: cleanup of tests that got lost in their own nested directories...
r16912 $ hg init follow
$ cd follow
Nicolas Dumazet
tests: unify test-log
r11900
$ echo base > base
$ hg ci -Ambase -d '1 0'
adding base
$ echo r1 >> base
$ hg ci -Amr1 -d '1 0'
$ echo r2 >> base
$ hg ci -Amr2 -d '1 0'
$ hg up -C 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo b1 > b1
liscju
revsets: makes follow() supports file patterns (issue4757) (BC)...
r26102
log -r "follow('set:clean()')"
$ hg log -r "follow('set:clean()')"
changeset: 0:67e992f2c4f3
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: base
changeset: 1:3d5bf5654eda
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: r1
Nicolas Dumazet
tests: unify test-log
r11900 $ hg ci -Amb1 -d '1 0'
adding b1
created new head
log -f
$ hg log -f
changeset: 3:e62f78d544b4
tag: tip
parent: 1:3d5bf5654eda
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: b1
changeset: 1:3d5bf5654eda
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: r1
changeset: 0:67e992f2c4f3
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: base
liscju
revsets: makes follow() supports file patterns (issue4757) (BC)...
r26102 log -r follow('glob:b*')
Nicolas Dumazet
tests: unify test-log
r11900
liscju
revsets: makes follow() supports file patterns (issue4757) (BC)...
r26102 $ hg log -r "follow('glob:b*')"
changeset: 0:67e992f2c4f3
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: base
changeset: 1:3d5bf5654eda
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: r1
changeset: 3:e62f78d544b4
tag: tip
parent: 1:3d5bf5654eda
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: b1
Durham Goode
log: make -fr show complete history from the given revs...
r24189 log -f -r '1 + 4'
Nicolas Dumazet
tests: unify test-log
r11900
$ hg up -C 0
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo b2 > b2
$ hg ci -Amb2 -d '1 0'
adding b2
created new head
Durham Goode
log: make -fr show complete history from the given revs...
r24189 $ hg log -f -r '1 + 4'
changeset: 4:ddb82e70d1a1
tag: tip
parent: 0:67e992f2c4f3
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: b2
Nicolas Dumazet
tests: unify test-log
r11900 changeset: 1:3d5bf5654eda
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: r1
Durham Goode
log: make -fr show complete history from the given revs...
r24189 changeset: 0:67e992f2c4f3
Nicolas Dumazet
tests: unify test-log
r11900 user: test
date: Thu Jan 01 00:00:01 1970 +0000
Durham Goode
log: make -fr show complete history from the given revs...
r24189 summary: base
Nicolas Dumazet
tests: unify test-log
r11900
Yuya Nishihara
log: resolve --follow with -rREV in cmdutil.getlogrevs()...
r35702
log -fr with aliases: 'A' should be expanded, but 'reverse()' should have no
effect
$ hg log --config 'revsetalias.reverse(x)=x' --config 'revsetalias.A=1+4' -qfrA
4:ddb82e70d1a1
1:3d5bf5654eda
0:67e992f2c4f3
liscju
revsets: makes follow() supports file patterns (issue4757) (BC)...
r26102 log -r "follow('set:grep(b2)')"
$ hg log -r "follow('set:grep(b2)')"
changeset: 4:ddb82e70d1a1
tag: tip
parent: 0:67e992f2c4f3
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: b2
Gábor Stefanik
revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334)...
r29814 log -r "follow('set:grep(b2)', 4)"
$ hg up -qC 0
$ hg log -r "follow('set:grep(b2)', 4)"
changeset: 4:ddb82e70d1a1
tag: tip
parent: 0:67e992f2c4f3
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: b2
Yuya Nishihara
revset: make follow() accept multiple startrevs...
r35299
follow files starting from multiple revisions:
Yuya Nishihara
revset: make follow() accept keyword arguments...
r35300 $ hg log -T '{rev}: {files}\n' -r "follow('glob:b?', startrev=2+3+4)"
Yuya Nishihara
revset: make follow() accept multiple startrevs...
r35299 3: b1
4: b2
follow files starting from empty revision:
Yuya Nishihara
revset: make follow() accept keyword arguments...
r35300 $ hg log -T '{rev}: {files}\n' -r "follow('glob:*', startrev=.-.)"
Yuya Nishihara
revset: make follow() accept multiple startrevs...
r35299
Yuya Nishihara
revset: make follow() accept keyword arguments...
r35300 follow starting from revisions:
$ hg log -Gq -r "follow(startrev=2+4)"
Yuya Nishihara
revset: alias follow(startrev=rev) to ancestors(rev)...
r35301 o 4:ddb82e70d1a1
|
| o 2:60c670bf5b30
| |
| o 1:3d5bf5654eda
|/
@ 0:67e992f2c4f3
follow the current revision:
$ hg log -Gq -r "follow()"
@ 0:67e992f2c4f3
Yuya Nishihara
revset: make follow() accept keyword arguments...
r35300
Gábor Stefanik
revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334)...
r29814 $ hg up -qC 4
Yuya Nishihara
revset: fix ancestors(null) to include null revision (issue4512)...
r23956 log -f -r null
$ hg log -f -r null
changeset: -1:000000000000
user:
date: Thu Jan 01 00:00:00 1970 +0000
$ hg log -f -r null -G
o changeset: -1:000000000000
user:
date: Thu Jan 01 00:00:00 1970 +0000
Yuya Nishihara
log: fix --follow null parent not to include revision 0...
r24064 log -f with null parent
$ hg up -C null
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ hg log -f
Nicolas Dumazet
tests: unify test-log
r11900 log -r . with two parents
$ hg up -C 3
Yuya Nishihara
log: fix --follow null parent not to include revision 0...
r24064 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
Nicolas Dumazet
tests: unify test-log
r11900 $ hg merge tip
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg log -r .
changeset: 3:e62f78d544b4
parent: 1:3d5bf5654eda
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: b1
log -r . with one parent
$ hg ci -mm12 -d '1 0'
$ hg log -r .
changeset: 5:302e9dd6890d
tag: tip
parent: 3:e62f78d544b4
parent: 4:ddb82e70d1a1
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: m12
$ echo postm >> b1
$ hg ci -Amb1.1 -d'1 0'
log --follow-first
$ hg log --follow-first
changeset: 6:2404bbcab562
tag: tip
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: b1.1
changeset: 5:302e9dd6890d
parent: 3:e62f78d544b4
parent: 4:ddb82e70d1a1
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: m12
changeset: 3:e62f78d544b4
parent: 1:3d5bf5654eda
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: b1
changeset: 1:3d5bf5654eda
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: r1
changeset: 0:67e992f2c4f3
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: base
log -P 2
$ hg log -P 2
changeset: 6:2404bbcab562
tag: tip
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: b1.1
changeset: 5:302e9dd6890d
parent: 3:e62f78d544b4
parent: 4:ddb82e70d1a1
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: m12
changeset: 4:ddb82e70d1a1
parent: 0:67e992f2c4f3
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: b2
changeset: 3:e62f78d544b4
parent: 1:3d5bf5654eda
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: b1
log -r tip -p --git
$ hg log -r tip -p --git
changeset: 6:2404bbcab562
tag: tip
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: b1.1
diff --git a/b1 b/b1
--- a/b1
+++ b/b1
@@ -1,1 +1,2 @@
b1
+postm
log -r ""
$ hg log -r ''
hg: parse error: empty query
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Nicolas Dumazet
tests: unify test-log
r11900
log -r <some unknown node id>
$ hg log -r 1000000000000000000000000000000000000000
abort: unknown revision '1000000000000000000000000000000000000000'!
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Nicolas Dumazet
tests: unify test-log
r11900
log -k r1
$ hg log -k r1
changeset: 1:3d5bf5654eda
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: r1
log -p -l2 --color=always
$ hg --config extensions.color= --config color.mode=ansi \
> log -p -l2 --color=always
Mads Kiilerich
tests: use (esc) for all non-ASCII test output
r12942 \x1b[0;33mchangeset: 6:2404bbcab562\x1b[0m (esc)
Nicolas Dumazet
tests: unify test-log
r11900 tag: tip
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: b1.1
Mads Kiilerich
tests: use (esc) for all non-ASCII test output
r12942 \x1b[0;1mdiff -r 302e9dd6890d -r 2404bbcab562 b1\x1b[0m (esc)
\x1b[0;31;1m--- a/b1 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc)
\x1b[0;32;1m+++ b/b1 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc)
\x1b[0;35m@@ -1,1 +1,2 @@\x1b[0m (esc)
Nicolas Dumazet
tests: unify test-log
r11900 b1
Mads Kiilerich
tests: use (esc) for all non-ASCII test output
r12942 \x1b[0;32m+postm\x1b[0m (esc)
Nicolas Dumazet
tests: unify test-log
r11900
Mads Kiilerich
tests: use (esc) for all non-ASCII test output
r12942 \x1b[0;33mchangeset: 5:302e9dd6890d\x1b[0m (esc)
Nicolas Dumazet
tests: unify test-log
r11900 parent: 3:e62f78d544b4
parent: 4:ddb82e70d1a1
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: m12
Mads Kiilerich
tests: use (esc) for all non-ASCII test output
r12942 \x1b[0;1mdiff -r e62f78d544b4 -r 302e9dd6890d b2\x1b[0m (esc)
\x1b[0;31;1m--- /dev/null Thu Jan 01 00:00:00 1970 +0000\x1b[0m (esc)
\x1b[0;32;1m+++ b/b2 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc)
\x1b[0;35m@@ -0,0 +1,1 @@\x1b[0m (esc)
\x1b[0;32m+b2\x1b[0m (esc)
Nicolas Dumazet
tests: unify test-log
r11900
log -r tip --stat
$ hg log -r tip --stat
changeset: 6:2404bbcab562
tag: tip
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: b1.1
b1 | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
$ cd ..
Yuya Nishihara
log: copy the way of ancestor traversal to --follow matcher (issue5376)...
r30016 log --follow --patch FILE in repository where linkrev isn't trustworthy
(issue5376)
$ hg init follow-dup
$ cd follow-dup
$ cat <<EOF >> .hg/hgrc
> [ui]
> logtemplate = '=== {rev}: {desc}\n'
> [diff]
> nodates = True
> EOF
$ echo 0 >> a
$ hg ci -qAm 'a0'
$ echo 1 >> a
$ hg ci -m 'a1'
$ hg up -q 0
$ echo 1 >> a
$ touch b
$ hg ci -qAm 'a1 with b'
$ echo 3 >> a
$ hg ci -m 'a3'
fctx.rev() == 2, but fctx.linkrev() == 1
$ hg log -pf a
=== 3: a3
diff -r 4ea02ba94d66 -r e7a6331a34f0 a
--- a/a
+++ b/a
@@ -1,2 +1,3 @@
0
1
+3
=== 2: a1 with b
diff -r 49b5e81287e2 -r 4ea02ba94d66 a
--- a/a
+++ b/a
@@ -1,1 +1,2 @@
0
+1
=== 0: a0
diff -r 000000000000 -r 49b5e81287e2 a
--- /dev/null
+++ b/a
@@ -0,0 +1,1 @@
+0
fctx.introrev() == 2, but fctx.linkrev() == 1
$ hg up -q 2
$ hg log -pf a
=== 2: a1 with b
diff -r 49b5e81287e2 -r 4ea02ba94d66 a
--- a/a
+++ b/a
@@ -1,1 +1,2 @@
0
+1
=== 0: a0
diff -r 000000000000 -r 49b5e81287e2 a
--- /dev/null
+++ b/a
@@ -0,0 +1,1 @@
+0
$ cd ..
Yuya Nishihara
test-log: test that fctx.ancestors() can't index parents only by linkrev...
r35270 Multiple copy sources of a file:
$ hg init follow-multi
$ cd follow-multi
$ echo 0 >> a
$ hg ci -qAm 'a'
$ hg cp a b
$ hg ci -m 'a->b'
$ echo 2 >> a
$ hg ci -m 'a'
$ echo 3 >> b
$ hg ci -m 'b'
$ echo 4 >> a
$ echo 4 >> b
$ hg ci -m 'a,b'
$ echo 5 >> a
$ hg ci -m 'a0'
$ echo 6 >> b
$ hg ci -m 'b0'
$ hg up -q 4
$ echo 7 >> b
$ hg ci -m 'b1'
created new head
$ echo 8 >> a
$ hg ci -m 'a1'
$ hg rm a
$ hg mv b a
$ hg ci -m 'b1->a1'
$ hg merge -qt :local
$ hg ci -m '(a0,b1->a1)->a'
$ hg log -GT '{rev}: {desc}\n'
@ 10: (a0,b1->a1)->a
|\
| o 9: b1->a1
| |
| o 8: a1
| |
| o 7: b1
| |
o | 6: b0
| |
o | 5: a0
|/
o 4: a,b
|
o 3: b
|
o 2: a
|
o 1: a->b
|
o 0: a
since file 'a' has multiple copy sources at the revision 4, ancestors can't
be indexed solely by fctx.linkrev().
$ hg log -T '{rev}: {desc}\n' -f a
10: (a0,b1->a1)->a
9: b1->a1
7: b1
5: a0
4: a,b
3: b
2: a
1: a->b
0: a
$ cd ..
Yuya Nishihara
log: fix order of revisions filtered by multiple OR options (issue5100)...
r28253 Test that log should respect the order of -rREV even if multiple OR conditions
are specified (issue5100):
$ hg init revorder
$ cd revorder
$ hg branch -q b0
$ echo 0 >> f0
$ hg ci -qAm k0 -u u0
$ hg branch -q b1
$ echo 1 >> f1
$ hg ci -qAm k1 -u u1
$ hg branch -q b2
$ echo 2 >> f2
$ hg ci -qAm k2 -u u2
$ hg update -q b2
$ echo 3 >> f2
$ hg ci -qAm k2 -u u2
$ hg update -q b1
$ echo 4 >> f1
$ hg ci -qAm k1 -u u1
$ hg update -q b0
$ echo 5 >> f0
$ hg ci -qAm k0 -u u0
summary of revisions:
$ hg log -G -T '{rev} {branch} {author} {desc} {files}\n'
@ 5 b0 u0 k0 f0
|
| o 4 b1 u1 k1 f1
| |
| | o 3 b2 u2 k2 f2
| | |
| | o 2 b2 u2 k2 f2
| |/
| o 1 b1 u1 k1 f1
|/
o 0 b0 u0 k0 f0
log -b BRANCH in ascending order:
$ hg log -r0:tip -T '{rev} {branch}\n' -b b0 -b b1
0 b0
1 b1
4 b1
5 b0
$ hg log -r0:tip -T '{rev} {branch}\n' -b b1 -b b0
0 b0
1 b1
4 b1
5 b0
log --only-branch BRANCH in descending order:
$ hg log -rtip:0 -T '{rev} {branch}\n' --only-branch b1 --only-branch b2
4 b1
3 b2
2 b2
1 b1
$ hg log -rtip:0 -T '{rev} {branch}\n' --only-branch b2 --only-branch b1
4 b1
3 b2
2 b2
1 b1
log -u USER in ascending order, against compound set:
$ hg log -r'::head()' -T '{rev} {author}\n' -u u0 -u u2
0 u0
2 u2
3 u2
5 u0
$ hg log -r'::head()' -T '{rev} {author}\n' -u u2 -u u0
0 u0
2 u2
3 u2
5 u0
log -k TEXT in descending order, against compound set:
$ hg log -r'5 + reverse(::3)' -T '{rev} {desc}\n' -k k0 -k k1 -k k2
5 k0
3 k2
2 k2
1 k1
0 k0
$ hg log -r'5 + reverse(::3)' -T '{rev} {desc}\n' -k k2 -k k1 -k k0
5 k0
3 k2
2 k2
1 k1
0 k0
log FILE in ascending order, against dagrange:
$ hg log -r1:: -T '{rev} {files}\n' f1 f2
1 f1
2 f2
3 f2
4 f1
$ hg log -r1:: -T '{rev} {files}\n' f2 f1
1 f1
2 f2
3 f2
4 f1
$ cd ..
Mads Kiilerich
tests: cleanup of tests that got lost in their own nested directories...
r16912
User
Nicolas Dumazet
tests: unify test-log
r11900 $ hg init usertest
$ cd usertest
$ echo a > a
$ hg ci -A -m "a" -u "User One <user1@example.org>"
adding a
$ echo b > b
$ hg ci -A -m "b" -u "User Two <user2@example.org>"
adding b
$ hg log -u "User One <user1@example.org>"
changeset: 0:29a4c94f1924
user: User One <user1@example.org>
date: Thu Jan 01 00:00:00 1970 +0000
summary: a
$ hg log -u "user1" -u "user2"
changeset: 1:e834b5e69c0e
tag: tip
user: User Two <user2@example.org>
date: Thu Jan 01 00:00:00 1970 +0000
summary: b
changeset: 0:29a4c94f1924
user: User One <user1@example.org>
date: Thu Jan 01 00:00:00 1970 +0000
summary: a
$ hg log -u "user3"
Yuya Nishihara
log: don't expand aliases in revset built from command options...
r35561 "-u USER" shouldn't be overridden by "user(USER)" alias
$ hg log --config 'revsetalias.user(x)=branch(x)' -u default
$ hg log --config 'revsetalias.user(x)=branch(x)' -u user1
changeset: 0:29a4c94f1924
user: User One <user1@example.org>
date: Thu Jan 01 00:00:00 1970 +0000
summary: a
Nicolas Dumazet
tests: unify test-log
r11900 $ cd ..
$ hg init branches
$ cd branches
$ echo a > a
$ hg ci -A -m "commit on default"
adding a
$ hg branch test
marked working directory as branch test
Matt Mackall
branch: warn on branching
r15615 (branches are permanent and global, did you want a bookmark?)
Nicolas Dumazet
tests: unify test-log
r11900 $ echo b > b
$ hg ci -A -m "commit on test"
adding b
$ hg up default
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo c > c
$ hg ci -A -m "commit on default"
adding c
$ hg up test
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo c > c
$ hg ci -A -m "commit on test"
adding c
log -b default
$ hg log -b default
changeset: 2:c3a4f03cc9a7
parent: 0:24427303d56f
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: commit on default
changeset: 0:24427303d56f
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: commit on default
log -b test
$ hg log -b test
changeset: 3:f5d8de11c2e2
branch: test
tag: tip
parent: 1:d32277701ccb
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: commit on test
changeset: 1:d32277701ccb
branch: test
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: commit on test
log -b dummy
$ hg log -b dummy
abort: unknown revision 'dummy'!
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Nicolas Dumazet
tests: unify test-log
r11900
log -b .
$ hg log -b .
changeset: 3:f5d8de11c2e2
branch: test
tag: tip
parent: 1:d32277701ccb
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: commit on test
changeset: 1:d32277701ccb
branch: test
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: commit on test
log -b default -b test
$ hg log -b default -b test
changeset: 3:f5d8de11c2e2
branch: test
tag: tip
parent: 1:d32277701ccb
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: commit on test
changeset: 2:c3a4f03cc9a7
parent: 0:24427303d56f
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: commit on default
changeset: 1:d32277701ccb
branch: test
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: commit on test
changeset: 0:24427303d56f
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: commit on default
log -b default -b .
$ hg log -b default -b .
changeset: 3:f5d8de11c2e2
branch: test
tag: tip
parent: 1:d32277701ccb
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: commit on test
changeset: 2:c3a4f03cc9a7
parent: 0:24427303d56f
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: commit on default
changeset: 1:d32277701ccb
branch: test
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: commit on test
changeset: 0:24427303d56f
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: commit on default
log -b . -b test
$ hg log -b . -b test
changeset: 3:f5d8de11c2e2
branch: test
tag: tip
parent: 1:d32277701ccb
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: commit on test
changeset: 1:d32277701ccb
branch: test
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: commit on test
log -b 2
$ hg log -b 2
changeset: 2:c3a4f03cc9a7
parent: 0:24427303d56f
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: commit on default
changeset: 0:24427303d56f
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: commit on default
Sean Farley
tests: add a i18n translation test for log output...
r23771 #if gettext
Nicolas Dumazet
tests: unify test-log
r11900
Sean Farley
tests: add a i18n translation test for log output...
r23771 Test that all log names are translated (e.g. branches, bookmarks, tags):
$ hg bookmark babar -r tip
$ HGENCODING=UTF-8 LANGUAGE=de hg log -r tip
\xc3\x84nderung: 3:f5d8de11c2e2 (esc)
Zweig: test
Lesezeichen: babar
Marke: tip
Vorg\xc3\xa4nger: 1:d32277701ccb (esc)
Nutzer: test
Datum: Thu Jan 01 00:00:00 1970 +0000
Zusammenfassung: commit on test
$ hg bookmark -d babar
#endif
Nicolas Dumazet
tests: unify test-log
r11900
log -p --cwd dir (in subdir)
$ mkdir dir
$ hg log -p --cwd dir
changeset: 3:f5d8de11c2e2
branch: test
tag: tip
parent: 1:d32277701ccb
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: commit on test
diff -r d32277701ccb -r f5d8de11c2e2 c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/c Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
+c
changeset: 2:c3a4f03cc9a7
parent: 0:24427303d56f
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: commit on default
diff -r 24427303d56f -r c3a4f03cc9a7 c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/c Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
+c
changeset: 1:d32277701ccb
branch: test
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: commit on test
diff -r 24427303d56f -r d32277701ccb b
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/b Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
+b
changeset: 0:24427303d56f
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: commit on default
diff -r 000000000000 -r 24427303d56f a
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/a Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
+a
log -p -R repo
$ cd dir
$ hg log -p -R .. ../a
changeset: 0:24427303d56f
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: commit on default
diff -r 000000000000 -r 24427303d56f a
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/a Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
+a
Mads Kiilerich
tests: cleanup of tests that got lost in their own nested directories...
r16912 $ cd ../..
Nicolas Dumazet
tests: unify test-log
r11900
$ hg init follow2
$ cd follow2
# Build the following history:
# tip - o - x - o - x - x
# \ /
# o - o - o - x
# \ /
# o
#
# Where "o" is a revision containing "foo" and
# "x" is a revision without "foo"
$ touch init
$ hg ci -A -m "init, unrelated"
adding init
$ echo 'foo' > init
$ hg ci -m "change, unrelated"
$ echo 'foo' > foo
$ hg ci -A -m "add unrelated old foo"
adding foo
$ hg rm foo
$ hg ci -m "delete foo, unrelated"
$ echo 'related' > foo
$ hg ci -A -m "add foo, related"
adding foo
$ hg up 0
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ touch branch
$ hg ci -A -m "first branch, unrelated"
adding branch
created new head
$ touch foo
$ hg ci -A -m "create foo, related"
adding foo
$ echo 'change' > foo
$ hg ci -m "change foo, related"
$ hg up 6
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo 'change foo in branch' > foo
$ hg ci -m "change foo in branch, related"
created new head
$ hg merge 7
merging foo
Siddharth Agarwal
simplemerge: move conflict warning message to filemerge...
r26614 warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
Nicolas Dumazet
tests: unify test-log
r11900 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
Pulkit Goyal
merge: add `--abort` flag which can abort the merge...
r35722 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
Matt Mackall
tests: add exit codes to unified tests
r12316 [1]
Nicolas Dumazet
tests: unify test-log
r11900 $ echo 'merge 1' > foo
$ hg resolve -m foo
Pierre-Yves David
resolve: add parenthesis around "no more unresolved files" message...
r21947 (no more unresolved files)
Nicolas Dumazet
tests: unify test-log
r11900 $ hg ci -m "First merge, related"
$ hg merge 4
merging foo
Siddharth Agarwal
simplemerge: move conflict warning message to filemerge...
r26614 warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
Nicolas Dumazet
tests: unify test-log
r11900 1 files updated, 0 files merged, 0 files removed, 1 files unresolved
Pulkit Goyal
merge: add `--abort` flag which can abort the merge...
r35722 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
Matt Mackall
tests: add exit codes to unified tests
r12316 [1]
Nicolas Dumazet
tests: unify test-log
r11900 $ echo 'merge 2' > foo
$ hg resolve -m foo
Pierre-Yves David
resolve: add parenthesis around "no more unresolved files" message...
r21947 (no more unresolved files)
Nicolas Dumazet
tests: unify test-log
r11900 $ hg ci -m "Last merge, related"
Patrick Mezard
log: support --graph without graphlog extension...
r17181 $ hg log --graph
Nicolas Dumazet
tests: unify test-log
r11900 @ changeset: 10:4dae8563d2c5
|\ tag: tip
| | parent: 9:7b35701b003e
| | parent: 4:88176d361b69
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | summary: Last merge, related
| |
| o changeset: 9:7b35701b003e
| |\ parent: 8:e5416ad8a855
| | | parent: 7:87fe3144dcfa
| | | user: test
| | | date: Thu Jan 01 00:00:00 1970 +0000
| | | summary: First merge, related
| | |
| | o changeset: 8:e5416ad8a855
| | | parent: 6:dc6c325fe5ee
| | | user: test
| | | date: Thu Jan 01 00:00:00 1970 +0000
| | | summary: change foo in branch, related
| | |
| o | changeset: 7:87fe3144dcfa
| |/ user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | summary: change foo, related
| |
| o changeset: 6:dc6c325fe5ee
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | summary: create foo, related
| |
| o changeset: 5:73db34516eb9
| | parent: 0:e87515fd044a
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | summary: first branch, unrelated
| |
o | changeset: 4:88176d361b69
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | summary: add foo, related
| |
o | changeset: 3:dd78ae4afb56
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | summary: delete foo, unrelated
| |
o | changeset: 2:c4c64aedf0f7
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | summary: add unrelated old foo
| |
o | changeset: 1:e5faa7440653
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: change, unrelated
|
o changeset: 0:e87515fd044a
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: init, unrelated
$ hg --traceback log -f foo
changeset: 10:4dae8563d2c5
tag: tip
parent: 9:7b35701b003e
parent: 4:88176d361b69
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: Last merge, related
changeset: 9:7b35701b003e
parent: 8:e5416ad8a855
parent: 7:87fe3144dcfa
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: First merge, related
changeset: 8:e5416ad8a855
parent: 6:dc6c325fe5ee
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: change foo in branch, related
changeset: 7:87fe3144dcfa
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: change foo, related
changeset: 6:dc6c325fe5ee
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: create foo, related
changeset: 4:88176d361b69
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: add foo, related
Mads Kiilerich
merge with stable
r12383
Nicolas Dumazet
log: fix log -rREV FILE when REV isnt the last filerev (issue2492)...
r12972 Also check when maxrev < lastrevfilelog
$ hg --traceback log -f -r4 foo
changeset: 4:88176d361b69
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: add foo, related
Mads Kiilerich
tests: cleanup of tests that got lost in their own nested directories...
r16912 $ cd ..
Nicolas Dumazet
log: fix log -rREV FILE when REV isnt the last filerev (issue2492)...
r12972
Martin Geisler
tests: added a short description to issue numbers...
r12399 Issue2383: hg log showing _less_ differences than hg diff
Mads Kiilerich
merge with stable
r12383
$ hg init issue2383
$ cd issue2383
Create a test repo:
$ echo a > a
$ hg ci -Am0
adding a
$ echo b > b
$ hg ci -Am1
adding b
$ hg co 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo b > a
$ hg ci -m2
created new head
Merge:
$ hg merge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
Make sure there's a file listed in the merge to trigger the bug:
$ echo c > a
$ hg ci -m3
Two files shown here in diff:
$ hg diff --rev 2:3
diff -r b09be438c43a -r 8e07aafe1edc a
--- a/a Thu Jan 01 00:00:00 1970 +0000
+++ b/a Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,1 @@
-b
+c
diff -r b09be438c43a -r 8e07aafe1edc b
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/b Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
+b
Diff here should be the same:
$ hg log -vpr 3
changeset: 3:8e07aafe1edc
tag: tip
parent: 2:b09be438c43a
parent: 1:925d80f479bb
user: test
date: Thu Jan 01 00:00:00 1970 +0000
files: a
description:
3
diff -r b09be438c43a -r 8e07aafe1edc a
--- a/a Thu Jan 01 00:00:00 1970 +0000
+++ b/a Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,1 @@
-b
+c
diff -r b09be438c43a -r 8e07aafe1edc b
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/b Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
+b
$ cd ..
Nicolas Dumazet
log: fix log -rREV FILE when REV isnt the last filerev (issue2492)...
r12972
'hg log -r rev fn' when last(filelog(fn)) != rev
Mads Kiilerich
tests: cleanup of tests that got lost in their own nested directories...
r16912 $ hg init simplelog
$ cd simplelog
Nicolas Dumazet
log: fix log -rREV FILE when REV isnt the last filerev (issue2492)...
r12972 $ echo f > a
$ hg ci -Am'a' -d '0 0'
adding a
$ echo f >> a
$ hg ci -Am'a bis' -d '1 0'
$ hg log -r0 a
changeset: 0:9f758d63dcde
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: a
Pierre-Yves David
test: use obsolescence marker to test hidden...
r18208 enable obsolete to test hidden feature
Durham Goode
obsolete: update tests to use obsolete options...
r22955 $ cat >> $HGRCPATH << EOF
> [experimental]
Boris Feld
config: use 'experimental.evolution.create-markers'...
r34867 > evolution.createmarkers=True
Pierre-Yves David
log: do not display hidden changeset...
r14645 > EOF
Pierre-Yves David
test: use obsolescence marker to test hidden...
r18208
Pierre-Yves David
log: do not display hidden changeset...
r14645 $ hg log --template='{rev}:{node}\n'
1:a765632148dc55d38c35c4f247c618701886cb2f
0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
Pierre-Yves David
test: use obsolescence marker to test hidden...
r18208 $ hg debugobsolete a765632148dc55d38c35c4f247c618701886cb2f
Boris Feld
debugobsolete: also report the number of obsoleted changesets...
r33542 obsoleted 1 changesets
Pierre-Yves David
test: use obsolescence marker to test hidden...
r18208 $ hg up null -q
Pierre-Yves David
log: do not display hidden changeset...
r14645 $ hg log --template='{rev}:{node}\n'
0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
$ hg log --template='{rev}:{node}\n' --hidden
1:a765632148dc55d38c35c4f247c618701886cb2f
0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
Matt Mackall
revlog: handle hidden revs in _partialmatch (issue3979)...
r19471 $ hg log -r a
Boris Feld
visibility: improve the message when accessing filtered obsolete rev...
r35589 abort: hidden revision 'a' is pruned!
Pierre-Yves David
repoview: issue a special message when filtering hidden changesets...
r23046 (use --hidden to access hidden revisions)
Matt Mackall
revlog: handle hidden revs in _partialmatch (issue3979)...
r19471 [255]
FUJIWARA Katsunori
i18n: use "encoding.lower()" to normalize specified keywords for log searching...
r15725
Pierre-Yves David
hidden: use both parents of working directory...
r18250 test that parent prevent a changeset to be hidden
Pierre-Yves David
clfilter: enforce hidden changeset globally...
r18267 $ hg up 1 -q --hidden
Martin von Zweigbergk
update: print warning about hidden changeset after update...
r37939 updated to hidden changeset a765632148dc
Boris Feld
update: display the obsfate of hidden revision we update to...
r35729 (hidden revision 'a765632148dc' is pruned)
Pierre-Yves David
hidden: use both parents of working directory...
r18250 $ hg log --template='{rev}:{node}\n'
1:a765632148dc55d38c35c4f247c618701886cb2f
0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
test that second parent prevent a changeset to be hidden too
$ hg debugsetparents 0 1 # nothing suitable to merge here
$ hg log --template='{rev}:{node}\n'
1:a765632148dc55d38c35c4f247c618701886cb2f
0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
Kevin Bullock
filtering: test that bookmarks prevent hiding of changesets
r18494 $ hg debugsetparents 1
$ hg up -q null
bookmarks prevent a changeset being hidden
$ hg bookmark --hidden -r 1 X
Pulkit Goyal
bookmarks: add bookmarks to hidden revs if directaccess config is set...
r35629 bookmarking hidden changeset a765632148dc
Boris Feld
bookmarks: display the obsfate of hidden revision we create a bookmark on...
r35730 (hidden revision 'a765632148dc' is pruned)
Kevin Bullock
filtering: test that bookmarks prevent hiding of changesets
r18494 $ hg log --template '{rev}:{node}\n'
1:a765632148dc55d38c35c4f247c618701886cb2f
0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
Kevin Bullock
bookmarks: don't use bookmarks.listbookmarks in local computations...
r18495 $ hg bookmark -d X
divergent bookmarks are not hidden
$ hg bookmark --hidden -r 1 X@foo
Pulkit Goyal
bookmarks: add bookmarks to hidden revs if directaccess config is set...
r35629 bookmarking hidden changeset a765632148dc
Boris Feld
bookmarks: display the obsfate of hidden revision we create a bookmark on...
r35730 (hidden revision 'a765632148dc' is pruned)
Kevin Bullock
bookmarks: don't use bookmarks.listbookmarks in local computations...
r18495 $ hg log --template '{rev}:{node}\n'
1:a765632148dc55d38c35c4f247c618701886cb2f
0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
Pierre-Yves David
hidden: use both parents of working directory...
r18250
Yuya Nishihara
revset: do not rewrite ':y' to '0:y' (issue5385)...
r30044 test hidden revision 0 (issue5385)
$ hg bookmark -d X@foo
$ hg up null -q
$ hg debugobsolete 9f758d63dcde62d547ebfb08e1e7ee96535f2b05
Boris Feld
debugobsolete: also report the number of obsoleted changesets...
r33542 obsoleted 1 changesets
Yuya Nishihara
revset: do not rewrite ':y' to '0:y' (issue5385)...
r30044 $ echo f > b
$ hg ci -Am'b' -d '2 0'
adding b
$ echo f >> b
$ hg ci -m'b bis' -d '3 0'
$ hg log -T'{rev}:{node}\n'
3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e
2:94375ec45bddd2a824535fc04855bd058c926ec0
$ hg log -T'{rev}:{node}\n' -r:
2:94375ec45bddd2a824535fc04855bd058c926ec0
3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e
$ hg log -T'{rev}:{node}\n' -r:tip
2:94375ec45bddd2a824535fc04855bd058c926ec0
3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e
$ hg log -T'{rev}:{node}\n' -r:0
Boris Feld
visibility: improve the message when accessing filtered obsolete rev...
r35589 abort: hidden revision '0' is pruned!
Yuya Nishihara
revset: do not rewrite ':y' to '0:y' (issue5385)...
r30044 (use --hidden to access hidden revisions)
[255]
$ hg log -T'{rev}:{node}\n' -f
3:d7d28b288a6b83d5d2cf49f10c5974deed3a1d2e
2:94375ec45bddd2a824535fc04855bd058c926ec0
FUJIWARA Katsunori
i18n: use "encoding.lower()" to normalize specified keywords for log searching...
r15725 clear extensions configuration
$ echo '[extensions]' >> $HGRCPATH
Pierre-Yves David
test: use obsolescence marker to test hidden...
r18208 $ echo "obs=!" >> $HGRCPATH
FUJIWARA Katsunori
i18n: use "encoding.lower()" to normalize specified keywords for log searching...
r15725 $ cd ..
test -u/-k for problematic encoding
# unicode: cp932:
# u30A2 0x83 0x41(= 'A')
# u30C2 0x83 0x61(= 'a')
$ hg init problematicencoding
$ cd problematicencoding
Augie Fackler
tests: port test-log to Python 3...
r36711 >>> with open('setup.sh', 'wb') as f:
... f.write(u'''
... echo a > text
... hg add text
... hg --encoding utf-8 commit -u '\u30A2' -m none
... echo b > text
... hg --encoding utf-8 commit -u '\u30C2' -m none
... echo c > text
... hg --encoding utf-8 commit -u none -m '\u30A2'
... echo d > text
... hg --encoding utf-8 commit -u none -m '\u30C2'
... '''.encode('utf-8')) and None
FUJIWARA Katsunori
i18n: use "encoding.lower()" to normalize specified keywords for log searching...
r15725 $ sh < setup.sh
test in problematic encoding
Augie Fackler
tests: port test-log to Python 3...
r36711 >>> with open('test.sh', 'wb') as f:
... f.write(u'''
... hg --encoding cp932 log --template '{rev}\\n' -u '\u30A2'
... echo ====
... hg --encoding cp932 log --template '{rev}\\n' -u '\u30C2'
... echo ====
... hg --encoding cp932 log --template '{rev}\\n' -k '\u30A2'
... echo ====
... hg --encoding cp932 log --template '{rev}\\n' -k '\u30C2'
... '''.encode('cp932')) and None
FUJIWARA Katsunori
i18n: use "encoding.lower()" to normalize specified keywords for log searching...
r15725 $ sh < test.sh
0
====
1
====
2
0
====
3
1
$ cd ..
smuralid
log: speed up hg log for untracked files (issue1340)...
r17746
test hg log on non-existent files and on directories
$ hg init issue1340
$ cd issue1340
$ mkdir d1; mkdir D2; mkdir D3.i; mkdir d4.hg; mkdir d5.d; mkdir .d6
$ echo 1 > d1/f1
$ echo 1 > D2/f1
$ echo 1 > D3.i/f1
$ echo 1 > d4.hg/f1
$ echo 1 > d5.d/f1
$ echo 1 > .d6/f1
Adrian Buehlmann
test-log: fix / vs \ issues on Windows introduced with 6d218e47cf9b...
r17781 $ hg -q add .
smuralid
log: speed up hg log for untracked files (issue1340)...
r17746 $ hg commit -m "a bunch of weird directories"
$ hg log -l1 d1/f1 | grep changeset
changeset: 0:65624cd9070a
$ hg log -l1 f1
$ hg log -l1 . | grep changeset
changeset: 0:65624cd9070a
$ hg log -l1 ./ | grep changeset
changeset: 0:65624cd9070a
$ hg log -l1 d1 | grep changeset
changeset: 0:65624cd9070a
$ hg log -l1 D2 | grep changeset
changeset: 0:65624cd9070a
$ hg log -l1 D2/f1 | grep changeset
changeset: 0:65624cd9070a
$ hg log -l1 D3.i | grep changeset
changeset: 0:65624cd9070a
$ hg log -l1 D3.i/f1 | grep changeset
changeset: 0:65624cd9070a
$ hg log -l1 d4.hg | grep changeset
changeset: 0:65624cd9070a
$ hg log -l1 d4.hg/f1 | grep changeset
changeset: 0:65624cd9070a
$ hg log -l1 d5.d | grep changeset
changeset: 0:65624cd9070a
$ hg log -l1 d5.d/f1 | grep changeset
changeset: 0:65624cd9070a
$ hg log -l1 .d6 | grep changeset
changeset: 0:65624cd9070a
$ hg log -l1 .d6/f1 | grep changeset
changeset: 0:65624cd9070a
Sean Farley
log: remove any ancestors of nullrev (issue3772)...
r18466
issue3772: hg log -r :null showing revision 0 as well
$ hg log -r :null
Cristian Zamfir
hg log: solves bug regarding hg log -r 0:null (issue4039)...
r20699 changeset: 0:65624cd9070a
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: a bunch of weird directories
Sean Farley
log: remove any ancestors of nullrev (issue3772)...
r18466 changeset: -1:000000000000
user:
date: Thu Jan 01 00:00:00 1970 +0000
Kevin Bullock
tests: add regression tests for another revrange edge case...
r18468 $ hg log -r null:null
changeset: -1:000000000000
user:
date: Thu Jan 01 00:00:00 1970 +0000
Yuya Nishihara
changeset_printer: display p1rev:p1node with "+" suffix for workingctx...
r24584 working-directory revision requires special treatment
Yuya Nishihara
tests: include modified/added/removed files in "log -r wdir()" output...
r28565 clean:
$ hg log -r 'wdir()' --debug
changeset: 2147483647:ffffffffffffffffffffffffffffffffffffffff
phase: draft
parent: 0:65624cd9070a035fa7191a54f2b8af39f16b0c08
parent: -1:0000000000000000000000000000000000000000
user: test
date: [A-Za-z0-9:+ ]+ (re)
extra: branch=default
Yuya Nishihara
tests: add test for "log -r wdir() -p" (issue4871)...
r28566 $ hg log -r 'wdir()' -p --stat
changeset: 2147483647:ffffffffffff
parent: 0:65624cd9070a
user: test
date: [A-Za-z0-9:+ ]+ (re)
Yuya Nishihara
tests: include modified/added/removed files in "log -r wdir()" output...
r28565
dirty:
$ echo 2 >> d1/f1
$ echo 2 > d1/f2
$ hg add d1/f2
$ hg remove .d6/f1
$ hg status
M d1/f1
A d1/f2
R .d6/f1
Yuya Nishihara
changeset_printer: display p1rev:p1node with "+" suffix for workingctx...
r24584 $ hg log -r 'wdir()'
Yuya Nishihara
changeset_printer: display wdirrev/wdirnode values for workingctx...
r25762 changeset: 2147483647:ffffffffffff
Yuya Nishihara
changeset_printer: use node.wdirrev to calculate meaningful parentrevs...
r25739 parent: 0:65624cd9070a
Yuya Nishihara
changeset_printer: display p1rev:p1node with "+" suffix for workingctx...
r24584 user: test
date: [A-Za-z0-9:+ ]+ (re)
$ hg log -r 'wdir()' -q
Yuya Nishihara
changeset_printer: display wdirrev/wdirnode values for workingctx...
r25762 2147483647:ffffffffffff
Yuya Nishihara
changeset_printer: display p1rev:p1node with "+" suffix for workingctx...
r24584
Yuya Nishihara
changeset_printer: hide manifest node for workingctx...
r24585 $ hg log -r 'wdir()' --debug
Yuya Nishihara
changeset_printer: display wdirrev/wdirnode values for workingctx...
r25762 changeset: 2147483647:ffffffffffffffffffffffffffffffffffffffff
Yuya Nishihara
changeset_printer: hide manifest node for workingctx...
r24585 phase: draft
parent: 0:65624cd9070a035fa7191a54f2b8af39f16b0c08
parent: -1:0000000000000000000000000000000000000000
user: test
date: [A-Za-z0-9:+ ]+ (re)
Yuya Nishihara
tests: include modified/added/removed files in "log -r wdir()" output...
r28565 files: d1/f1
files+: d1/f2
files-: .d6/f1
Yuya Nishihara
changeset_printer: hide manifest node for workingctx...
r24585 extra: branch=default
Yuya Nishihara
tests: add test for "log -r wdir() -p" (issue4871)...
r28566 $ hg log -r 'wdir()' -p --stat --git
changeset: 2147483647:ffffffffffff
parent: 0:65624cd9070a
user: test
date: [A-Za-z0-9:+ ]+ (re)
.d6/f1 | 1 -
d1/f1 | 1 +
d1/f2 | 1 +
3 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/.d6/f1 b/.d6/f1
deleted file mode 100644
--- a/.d6/f1
+++ /dev/null
@@ -1,1 +0,0 @@
-1
diff --git a/d1/f1 b/d1/f1
--- a/d1/f1
+++ b/d1/f1
@@ -1,1 +1,2 @@
1
+2
diff --git a/d1/f2 b/d1/f2
new file mode 100644
--- /dev/null
+++ b/d1/f2
@@ -0,0 +1,1 @@
+2
Yuya Nishihara
jsonchangeset: set rev and node to "null" for workingctx
r24602 $ hg log -r 'wdir()' -Tjson
[
{
Yuya Nishihara
logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter...
r37790 "bookmarks": [],
Yuya Nishihara
jsonchangeset: set rev and node to "null" for workingctx
r24602 "branch": "default",
"date": [*, 0], (glob)
"desc": "",
Yuya Nishihara
logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter...
r37790 "node": null,
"parents": ["65624cd9070a035fa7191a54f2b8af39f16b0c08"],
"phase": "draft",
"rev": null,
Matt Harbison
workingctx: don't report the tags for its parents...
r25688 "tags": [],
Yuya Nishihara
logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter...
r37790 "user": "test"
Yuya Nishihara
jsonchangeset: set rev and node to "null" for workingctx
r24602 }
]
$ hg log -r 'wdir()' -Tjson -q
[
{
Yuya Nishihara
logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter...
r37790 "node": null,
"rev": null
Yuya Nishihara
jsonchangeset: set rev and node to "null" for workingctx
r24602 }
]
Yuya Nishihara
jsonchangeset: set manifest node to "null" for workingctx...
r24603 $ hg log -r 'wdir()' -Tjson --debug
[
{
Yuya Nishihara
logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter...
r37790 "added": ["d1/f2"],
"bookmarks": [],
Yuya Nishihara
jsonchangeset: set manifest node to "null" for workingctx...
r24603 "branch": "default",
"date": [*, 0], (glob)
"desc": "",
Yuya Nishihara
logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter...
r37790 "extra": {"branch": "default"},
Yuya Nishihara
jsonchangeset: set manifest node to "null" for workingctx...
r24603 "manifest": null,
Yuya Nishihara
tests: include modified/added/removed files in "log -r wdir()" output...
r28565 "modified": ["d1/f1"],
Yuya Nishihara
logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter...
r37790 "node": null,
"parents": ["65624cd9070a035fa7191a54f2b8af39f16b0c08"],
"phase": "draft",
"removed": [".d6/f1"],
"rev": null,
"tags": [],
"user": "test"
Yuya Nishihara
jsonchangeset: set manifest node to "null" for workingctx...
r24603 }
]
Yuya Nishihara
tests: include modified/added/removed files in "log -r wdir()" output...
r28565 $ hg revert -aqC
Sean Farley
namespaces: add test for log...
r23773 Check that adding an arbitrary name shows up in log automatically
Sean Farley
log: remove any ancestors of nullrev (issue3772)...
r18466
Sean Farley
namespaces: add test for log...
r23773 $ cat > ../names.py <<EOF
> """A small extension to test adding arbitrary names to a repo"""
Augie Fackler
tests: update test-log to pass our import checker
r33967 > from __future__ import absolute_import
> from mercurial import namespaces
Sean Farley
namespaces: add test for log...
r23773 >
> def reposetup(ui, repo):
Augie Fackler
tests: port test-log to Python 3...
r36711 > foo = {b'foo': repo[0].node()}
Sean Farley
namespaces: use named args for namespace api...
r23873 > names = lambda r: foo.keys()
> namemap = lambda r, name: foo.get(name)
Pulkit Goyal
py3: use dict.items() instead of dict.iteritems() in tests...
r36345 > nodemap = lambda r, node: [name for name, n in foo.items()
Sean Farley
namespaces: use named args for namespace api...
r23873 > if n == node]
Augie Fackler
tests: update test-log to pass our import checker
r33967 > ns = namespaces.namespace(
Augie Fackler
tests: port test-log to Python 3...
r36711 > b"bars", templatename=b"bar", logname=b"barlog",
> colorname=b"barcolor", listnames=names, namemap=namemap,
Augie Fackler
tests: update test-log to pass our import checker
r33967 > nodemap=nodemap)
Sean Farley
namespaces: use named args for namespace api...
r23873 >
Sean Farley
namespaces: add test for log...
r23773 > repo.names.addnamespace(ns)
> EOF
$ hg --config extensions.names=../names.py log -r 0
changeset: 0:65624cd9070a
tag: tip
Sean Farley
log: use namespace logname and colorname...
r23876 barlog: foo
Sean Farley
namespaces: add test for log...
r23773 user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: a bunch of weird directories
Sean Farley
log: use namespace logname and colorname...
r23876 $ hg --config extensions.names=../names.py \
> --config extensions.color= --config color.log.barcolor=red \
> --color=always log -r 0
\x1b[0;33mchangeset: 0:65624cd9070a\x1b[0m (esc)
tag: tip
\x1b[0;31mbarlog: foo\x1b[0m (esc)
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: a bunch of weird directories
$ hg --config extensions.names=../names.py log -r 0 --template '{bars}\n'
foo
Ryan McElroy
templater: add hint to template parse errors to help locate issues...
r36687 Templater parse errors:
simple error
$ hg log -r . -T '{shortest(node}'
Yuya Nishihara
templater: fix position of terminator character in error message...
r36709 hg: parse error at 14: unexpected token: end
Ryan McElroy
templater: add hint to template parse errors to help locate issues...
r36687 ({shortest(node}
^ here)
[255]
multi-line template with error
$ hg log -r . -T 'line 1
> line2
> {shortest(node}
> line4\nline5'
Yuya Nishihara
templater: fix position of terminator character in error message...
r36709 hg: parse error at 27: unexpected token: end
Ryan McElroy
templater: provide hint for multi-line templates with parse errors...
r36688 (line 1\nline2\n{shortest(node}\nline4\nline5
^ here)
Ryan McElroy
templater: add hint to template parse errors to help locate issues...
r36687 [255]
smuralid
log: speed up hg log for untracked files (issue1340)...
r17746 $ cd ..
Durham Goode
log: fix log -f slow path to actually follow history...
r23500
hg log -f dir across branches
$ hg init acrossbranches
$ cd acrossbranches
$ mkdir d
$ echo a > d/a && hg ci -Aqm a
$ echo b > d/a && hg ci -Aqm b
$ hg up -q 0
$ echo b > d/a && hg ci -Aqm c
$ hg log -f d -T '{desc}' -G
@ c
|
o a
Mads Kiilerich
spelling: fixes from proofreading of spell checker issues
r24180 Ensure that largefiles doesn't interfere with following a normal file
Matt Harbison
largefiles: don't interfere with logging normal files...
r23976 $ hg --config extensions.largefiles= log -f d -T '{desc}' -G
FUJIWARA Katsunori
tests: add fsmonitor specific output lines at enabling largefiles...
r33209 The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
Matt Harbison
largefiles: don't interfere with logging normal files...
r23976 @ c
|
o a
Durham Goode
log: fix log -f slow path to actually follow history...
r23500 $ hg log -f d/a -T '{desc}' -G
Pierre-Yves David
linkrev: also adjust linkrev when bootstrapping 'follow' revset...
r23704 @ c
Durham Goode
log: fix log -f slow path to actually follow history...
r23500 |
o a
$ cd ..
Pierre-Yves David
filectx.parents: enforce changeid of parent to be in own changectx ancestors...
r23702
hg log -f with linkrev pointing to another branch
-------------------------------------------------
create history with a filerev whose linkrev points to another branch
$ hg init branchedlinkrev
$ cd branchedlinkrev
$ echo 1 > a
$ hg commit -Am 'content1'
adding a
$ echo 2 > a
$ hg commit -m 'content2'
$ hg up --rev 'desc(content1)'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo unrelated > unrelated
$ hg commit -Am 'unrelated'
adding unrelated
created new head
$ hg graft -r 'desc(content2)'
grafting 1:2294ae80ad84 "content2"
$ echo 3 > a
$ hg commit -m 'content3'
$ hg log -G
@ changeset: 4:50b9b36e9c5d
| tag: tip
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: content3
|
o changeset: 3:15b2327059e5
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: content2
|
o changeset: 2:2029acd1168c
| parent: 0:ae0a3c9f9e95
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: unrelated
|
| o changeset: 1:2294ae80ad84
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: content2
|
o changeset: 0:ae0a3c9f9e95
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: content1
log -f on the file should list the graft result.
$ hg log -Gf a
@ changeset: 4:50b9b36e9c5d
| tag: tip
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: content3
|
o changeset: 3:15b2327059e5
Martijn Pieters
graphmod: set default edge styles for ascii graphs (BC)...
r28627 : user: test
: date: Thu Jan 01 00:00:00 1970 +0000
: summary: content2
:
Pierre-Yves David
filectx.parents: enforce changeid of parent to be in own changectx ancestors...
r23702 o changeset: 0:ae0a3c9f9e95
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: content1
plain log lists the original version
(XXX we should probably list both)
$ hg log -G a
@ changeset: 4:50b9b36e9c5d
Martijn Pieters
graphmod: set default edge styles for ascii graphs (BC)...
r28627 : tag: tip
: user: test
: date: Thu Jan 01 00:00:00 1970 +0000
: summary: content3
:
: o changeset: 1:2294ae80ad84
:/ user: test
: date: Thu Jan 01 00:00:00 1970 +0000
: summary: content2
:
Pierre-Yves David
filectx.parents: enforce changeid of parent to be in own changectx ancestors...
r23702 o changeset: 0:ae0a3c9f9e95
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: content1
Pierre-Yves David
linkrev: also adjust linkrev when bootstrapping 'follow' revset...
r23704
hg log -f from the grafted changeset
(The bootstrap should properly take the topology in account)
$ hg up 'desc(content3)^'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -Gf a
@ changeset: 3:15b2327059e5
Martijn Pieters
graphmod: set default edge styles for ascii graphs (BC)...
r28627 : user: test
: date: Thu Jan 01 00:00:00 1970 +0000
: summary: content2
:
Pierre-Yves David
linkrev: also adjust linkrev when bootstrapping 'follow' revset...
r23704 o changeset: 0:ae0a3c9f9e95
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: content1
Pierre-Yves David
linkrev: work around linkrev to filtered entry in 'filelog' revset...
r23719
Test that we use the first non-hidden changeset in that case.
(hide the changeset)
$ hg log -T '{node}\n' -r 1
2294ae80ad8447bc78383182eeac50cb049df623
$ hg debugobsolete 2294ae80ad8447bc78383182eeac50cb049df623
Boris Feld
debugobsolete: also report the number of obsoleted changesets...
r33542 obsoleted 1 changesets
Pierre-Yves David
linkrev: work around linkrev to filtered entry in 'filelog' revset...
r23719 $ hg log -G
o changeset: 4:50b9b36e9c5d
| tag: tip
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: content3
|
@ changeset: 3:15b2327059e5
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: content2
|
o changeset: 2:2029acd1168c
| parent: 0:ae0a3c9f9e95
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: unrelated
|
o changeset: 0:ae0a3c9f9e95
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: content1
Check that log on the file does not drop the file revision.
$ hg log -G a
o changeset: 4:50b9b36e9c5d
| tag: tip
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: content3
|
@ changeset: 3:15b2327059e5
Martijn Pieters
graphmod: set default edge styles for ascii graphs (BC)...
r28627 : user: test
: date: Thu Jan 01 00:00:00 1970 +0000
: summary: content2
:
Pierre-Yves David
linkrev: work around linkrev to filtered entry in 'filelog' revset...
r23719 o changeset: 0:ae0a3c9f9e95
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: content1
Pierre-Yves David
linkrev-filelog: handle filtered linkrev with no visible children (issue4307)...
r23720 Even when a head revision is linkrev-shadowed.
$ hg log -T '{node}\n' -r 4
50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2
$ hg debugobsolete 50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2
Boris Feld
debugobsolete: also report the number of obsoleted changesets...
r33542 obsoleted 1 changesets
Pierre-Yves David
linkrev-filelog: handle filtered linkrev with no visible children (issue4307)...
r23720 $ hg log -G a
@ changeset: 3:15b2327059e5
Martijn Pieters
graphmod: set default edge styles for ascii graphs (BC)...
r28627 : tag: tip
: user: test
: date: Thu Jan 01 00:00:00 1970 +0000
: summary: content2
:
Pierre-Yves David
linkrev-filelog: handle filtered linkrev with no visible children (issue4307)...
r23720 o changeset: 0:ae0a3c9f9e95
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: content1
Pierre-Yves David
filectx.parents: enforce changeid of parent to be in own changectx ancestors...
r23702 $ cd ..
Pierre-Yves David
revset-filelog: handle hidden linkrev for file missing for head (issue4490)...
r23729
Even when the file revision is missing from some head:
$ hg init issue4490
$ cd issue4490
$ echo '[experimental]' >> .hg/hgrc
Boris Feld
config: use 'experimental.evolution.create-markers'...
r34867 $ echo 'evolution.createmarkers=True' >> .hg/hgrc
Pierre-Yves David
revset-filelog: handle hidden linkrev for file missing for head (issue4490)...
r23729 $ echo a > a
$ hg ci -Am0
adding a
$ echo b > b
$ hg ci -Am1
adding b
$ echo B > b
$ hg ci --amend -m 1
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo c > c
$ hg ci -Am2
adding c
created new head
$ hg up 'head() and not .'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg log -G
Saurabh Singh
cmdutil: remove the redundant commit during amend...
r34087 o changeset: 3:db815d6d32e6
Pierre-Yves David
revset-filelog: handle hidden linkrev for file missing for head (issue4490)...
r23729 | tag: tip
| parent: 0:f7b1eb17ad24
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: 2
|
Saurabh Singh
cmdutil: remove the redundant commit during amend...
r34087 | @ changeset: 2:9bc8ce7f9356
Pierre-Yves David
revset-filelog: handle hidden linkrev for file missing for head (issue4490)...
r23729 |/ parent: 0:f7b1eb17ad24
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: 1
|
o changeset: 0:f7b1eb17ad24
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 0
$ hg log -f -G b
Saurabh Singh
cmdutil: remove the redundant commit during amend...
r34087 @ changeset: 2:9bc8ce7f9356
Pierre-Yves David
revset-filelog: handle hidden linkrev for file missing for head (issue4490)...
r23729 | parent: 0:f7b1eb17ad24
Martijn Pieters
graphmod: set default edge styles for ascii graphs (BC)...
r28627 ~ user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 1
Pierre-Yves David
revset-filelog: handle hidden linkrev for file missing for head (issue4490)...
r23729 $ hg log -G b
Saurabh Singh
cmdutil: remove the redundant commit during amend...
r34087 @ changeset: 2:9bc8ce7f9356
Pierre-Yves David
revset-filelog: handle hidden linkrev for file missing for head (issue4490)...
r23729 | parent: 0:f7b1eb17ad24
Martijn Pieters
graphmod: set default edge styles for ascii graphs (BC)...
r28627 ~ user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 1
Pierre-Yves David
linkrev: use the right manifest content when adjusting linrev (issue4499)...
r23865 $ cd ..
Check proper report when the manifest changes but not the file issue4499
------------------------------------------------------------------------
$ hg init issue4499
$ cd issue4499
$ for f in A B C D F E G H I J K L M N O P Q R S T U; do
> echo 1 > $f;
> hg add $f;
> done
$ hg commit -m 'A1B1C1'
$ echo 2 > A
$ echo 2 > B
$ echo 2 > C
$ hg commit -m 'A2B2C2'
$ hg up 0
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo 3 > A
$ echo 2 > B
$ echo 2 > C
$ hg commit -m 'A3B2C2'
created new head
$ hg log -G
@ changeset: 2:fe5fc3d0eb17
| tag: tip
| parent: 0:abf4f0e38563
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: A3B2C2
|
| o changeset: 1:07dcc6b312c0
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: A2B2C2
|
o changeset: 0:abf4f0e38563
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: A1B1C1
Log -f on B should reports current changesets
$ hg log -fG B
@ changeset: 2:fe5fc3d0eb17
| tag: tip
| parent: 0:abf4f0e38563
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: A3B2C2
|
o changeset: 0:abf4f0e38563
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: A1B1C1
$ cd ..