tests/test-glog.t
changeset 42621 99ebde4fec99
parent 42307 264a2cbb25d0
child 42893 34a46d48d24e
equal deleted inserted replaced
42620:d98ec36be808 42621:99ebde4fec99
  1949       1 files changed, 1 insertions(+), 0 deletions(-)
  1949       1 files changed, 1 insertions(+), 0 deletions(-)
  1950   
  1950   
  1951 
  1951 
  1952   $ hg up -q 6
  1952   $ hg up -q 6
  1953   $ hg log -G --git --patch --follow-first e
  1953   $ hg log -G --git --patch --follow-first e
  1954   @    changeset:   6:fc281d8ff18d
  1954   @    changeset:   6:9feeac35a70a
  1955   |\   tag:         tip
  1955   |\   tag:         tip
  1956   | ~  parent:      5:99b31f1c2782
  1956   | ~  parent:      5:99b31f1c2782
  1957   |    parent:      4:17d952250a9d
  1957   |    parent:      4:17d952250a9d
  1958   |    user:        test
  1958   |    user:        test
  1959   |    date:        Thu Jan 01 00:00:00 1970 +0000
  1959   |    date:        Thu Jan 01 00:00:00 1970 +0000
  1996   created new head
  1996   created new head
  1997   $ hg up -q 2
  1997   $ hg up -q 2
  1998   $ hg log -G --template "{rev} {desc|firstline}\n"
  1998   $ hg log -G --template "{rev} {desc|firstline}\n"
  1999   o  8 add g
  1999   o  8 add g
  2000   |
  2000   |
  2001   | o  7 Added tag foo-bar for changeset fc281d8ff18d
  2001   | o  7 Added tag foo-bar for changeset 9feeac35a70a
  2002   |/
  2002   |/
  2003   o    6 merge 5 and 4
  2003   o    6 merge 5 and 4
  2004   |\
  2004   |\
  2005   | o  5 add another e
  2005   | o  5 add another e
  2006   | |
  2006   | |
  2159   +ee
  2159   +ee
  2160   # HG changeset patch
  2160   # HG changeset patch
  2161   # User test
  2161   # User test
  2162   # Date 0 0
  2162   # Date 0 0
  2163   #      Thu Jan 01 00:00:00 1970 +0000
  2163   #      Thu Jan 01 00:00:00 1970 +0000
  2164   # Node ID fc281d8ff18d999ad6497b3d27390bcd695dcc73
  2164   # Node ID 9feeac35a70aa325519bbf3178683271113f2b8f
  2165   # Parent  99b31f1c2782e2deb1723cef08930f70fc84b37b
  2165   # Parent  99b31f1c2782e2deb1723cef08930f70fc84b37b
  2166   # Parent  17d952250a9d03cc3dc77b199ab60e959b9b0260
  2166   # Parent  17d952250a9d03cc3dc77b199ab60e959b9b0260
  2167   merge 5 and 4
  2167   merge 5 and 4
  2168   
  2168   
  2169   diff -r 99b31f1c2782 -r fc281d8ff18d dir/b
  2169   diff -r 99b31f1c2782 -r 9feeac35a70a dir/b
  2170   --- a/dir/b	Thu Jan 01 00:00:00 1970 +0000
  2170   --- a/dir/b	Thu Jan 01 00:00:00 1970 +0000
  2171   +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
  2171   +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
  2172   @@ -1,1 +0,0 @@
  2172   @@ -1,1 +0,0 @@
  2173   -a
  2173   -a
  2174   diff -r 99b31f1c2782 -r fc281d8ff18d e
  2174   diff -r 99b31f1c2782 -r 9feeac35a70a e
  2175   --- a/e	Thu Jan 01 00:00:00 1970 +0000
  2175   --- a/e	Thu Jan 01 00:00:00 1970 +0000
  2176   +++ b/e	Thu Jan 01 00:00:00 1970 +0000
  2176   +++ b/e	Thu Jan 01 00:00:00 1970 +0000
  2177   @@ -1,1 +1,1 @@
  2177   @@ -1,1 +1,1 @@
  2178   -ee
  2178   -ee
  2179   +merge
  2179   +merge
  2180   # HG changeset patch
  2180   # HG changeset patch
  2181   # User test
  2181   # User test
  2182   # Date 0 0
  2182   # Date 0 0
  2183   #      Thu Jan 01 00:00:00 1970 +0000
  2183   #      Thu Jan 01 00:00:00 1970 +0000
  2184   # Node ID 02dbb8e276b8ab7abfd07cab50c901647e75c2dd
  2184   # Node ID 9febbb9c8b2e09670a2fb550cb1e4e01a2c7e9fd
  2185   # Parent  fc281d8ff18d999ad6497b3d27390bcd695dcc73
  2185   # Parent  9feeac35a70aa325519bbf3178683271113f2b8f
  2186   Added tag foo-bar for changeset fc281d8ff18d
  2186   Added tag foo-bar for changeset 9feeac35a70a
  2187   
  2187   
  2188   diff -r fc281d8ff18d -r 02dbb8e276b8 .hgtags
  2188   diff -r 9feeac35a70a -r 9febbb9c8b2e .hgtags
  2189   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
  2189   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
  2190   +++ b/.hgtags	Thu Jan 01 00:00:00 1970 +0000
  2190   +++ b/.hgtags	Thu Jan 01 00:00:00 1970 +0000
  2191   @@ -0,0 +1,1 @@
  2191   @@ -0,0 +1,1 @@
  2192   +fc281d8ff18d999ad6497b3d27390bcd695dcc73 foo-bar
  2192   +9feeac35a70aa325519bbf3178683271113f2b8f foo-bar
  2193   # HG changeset patch
  2193   # HG changeset patch
  2194   # User test
  2194   # User test
  2195   # Date 0 0
  2195   # Date 0 0
  2196   #      Thu Jan 01 00:00:00 1970 +0000
  2196   #      Thu Jan 01 00:00:00 1970 +0000
  2197   # Node ID 24c2e826ddebf80f9dcd60b856bdb8e6715c5449
  2197   # Node ID 3bd4551ec3fe1c0696241f236abe857a53c6d6e7
  2198   # Parent  fc281d8ff18d999ad6497b3d27390bcd695dcc73
  2198   # Parent  9feeac35a70aa325519bbf3178683271113f2b8f
  2199   add g
  2199   add g
  2200   
  2200   
  2201   diff -r fc281d8ff18d -r 24c2e826ddeb g
  2201   diff -r 9feeac35a70a -r 3bd4551ec3fe g
  2202   --- a/g	Thu Jan 01 00:00:00 1970 +0000
  2202   --- a/g	Thu Jan 01 00:00:00 1970 +0000
  2203   +++ b/g	Thu Jan 01 00:00:00 1970 +0000
  2203   +++ b/g	Thu Jan 01 00:00:00 1970 +0000
  2204   @@ -1,2 +1,1 @@
  2204   @@ -1,2 +1,1 @@
  2205   -f
  2205   -f
  2206   -f
  2206   -f
  2284   $ testlog --hidden
  2284   $ testlog --hidden
  2285   []
  2285   []
  2286   []
  2286   []
  2287   <spanset- 0:9>
  2287   <spanset- 0:9>
  2288   $ hg log -G --template '{rev} {desc}\n'
  2288   $ hg log -G --template '{rev} {desc}\n'
  2289   o  7 Added tag foo-bar for changeset fc281d8ff18d
  2289   o  7 Added tag foo-bar for changeset 9feeac35a70a
  2290   |
  2290   |
  2291   o    6 merge 5 and 4
  2291   o    6 merge 5 and 4
  2292   |\
  2292   |\
  2293   | o  5 add another e
  2293   | o  5 add another e
  2294   | |
  2294   | |
  2382   ~
  2382   ~
  2383 
  2383 
  2384 node template with changesetprinter:
  2384 node template with changesetprinter:
  2385 
  2385 
  2386   $ hg log -Gqr 5:7 --config ui.graphnodetemplate='"{rev}"'
  2386   $ hg log -Gqr 5:7 --config ui.graphnodetemplate='"{rev}"'
  2387   7  7:02dbb8e276b8
  2387   7  7:9febbb9c8b2e
  2388   |
  2388   |
  2389   6    6:fc281d8ff18d
  2389   6    6:9feeac35a70a
  2390   |\
  2390   |\
  2391   | ~
  2391   | ~
  2392   5  5:99b31f1c2782
  2392   5  5:99b31f1c2782
  2393   |
  2393   |
  2394   ~
  2394   ~
  2408 
  2408 
  2409 label() should just work in node template:
  2409 label() should just work in node template:
  2410 
  2410 
  2411   $ hg log -Gqr 7 --config extensions.color= --color=debug \
  2411   $ hg log -Gqr 7 --config extensions.color= --color=debug \
  2412   > --config ui.graphnodetemplate='{label("branch.{branch}", rev)}'
  2412   > --config ui.graphnodetemplate='{label("branch.{branch}", rev)}'
  2413   [branch.default|7]  [log.node|7:02dbb8e276b8]
  2413   [branch.default|7]  [log.node|7:9febbb9c8b2e]
  2414   |
  2414   |
  2415   ~
  2415   ~
  2416 
  2416 
  2417   $ cd ..
  2417   $ cd ..
  2418 
  2418