Mercurial Mercurial > test / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-keyword.out
branch0.9.2compat
changeset 397 db7cc16560d4
parent 387 ecb2935f9bb8
child 434 0884558504a3
equal deleted inserted replaced
388:05fbd226cb5c 397:db7cc16560d4 
    68 demo.txt = 
    68 demo.txt = 
    69 [keywordmaps]
 
    69 [keywordmaps]
 
    70 Branch = {branches}
 
    70 Branch = {branches}
 
    71 $Branch: demobranch $
 
    71 $Branch: demobranch $
 
    72 % kwshrink should exit silently in empty/invalid repo
 
    72 % kwshrink should exit silently in empty/invalid repo
 
       
    73 pulling from test-keyword.hg
 
       
    74 requesting all changes
 
       
    75 adding changesets
 
       
    76 adding manifests
 
       
    77 adding file changes
 
       
    78 added 1 changesets with 1 changes to 1 files
 
       
    79 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
    73 % cat
 
    80 % cat
 
    74 expand $Id$
 
    81 expand $Id$
 
    75 do not process $Id:
 
    82 do not process $Id:
 
    76 xxx $
 
    83 xxx $
 
    77 ignore $Id$
 
    84 ignore $Id$
 
    88 overwriting a expanding keywords
 
    95 overwriting a expanding keywords
 
    89 running hook commit.test: cp a hooktest
 
    96 running hook commit.test: cp a hooktest
 
    90 % status
 
    97 % status
 
    91 ? hooktest
 
    98 ? hooktest
 
    92 % identify
 
    99 % identify
 
    93 7f0665a496fd
 
   100 475643d17242
 
    94 % cat
 
   101 % cat
 
    95 expand $Id: a,v 7f0665a496fd 1970/01/01 00:00:00 user $
 
   102 expand $Id: a,v 475643d17242 1970/01/01 00:00:00 user $
 
    96 do not process $Id:
 
   103 do not process $Id:
 
    97 xxx $
 
   104 xxx $
 
    98 ignore $Id$
 
   105 ignore $Id$
 
    99 % hg cat
 
   106 % hg cat
 
   100 expand $Id: a,v 7f0665a496fd 1970/01/01 00:00:00 user $
 
   107 expand $Id: a,v 475643d17242 1970/01/01 00:00:00 user $
 
   101 do not process $Id:
 
   108 do not process $Id:
 
   102 xxx $
 
   109 xxx $
 
   103 ignore $Id$
 
   110 ignore $Id$
 
   104 
   111 
   105 % diff a hooktest
 
   112 % diff a hooktest
 
   109 pulling from ../kw.hg
 
   116 pulling from ../kw.hg
 
   110 requesting all changes
 
   117 requesting all changes
 
   111 adding changesets
 
   118 adding changesets
 
   112 adding manifests
 
   119 adding manifests
 
   113 adding file changes
 
   120 adding file changes
 
   114 added 1 changesets with 2 changes to 2 files
 
   121 added 2 changesets with 3 changes to 3 files
 
   115 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   122 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   116 % touch
 
   123 % touch
 
   117 % status
 
   124 % status
 
   118 % update
 
   125 % update
 
   119 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   126 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   120 % cat
 
   127 % cat
 
   121 expand $Id: a,v 7f0665a496fd 1970/01/01 00:00:00 user $
 
   128 expand $Id: a,v 475643d17242 1970/01/01 00:00:00 user $
 
   122 do not process $Id:
 
   129 do not process $Id:
 
   123 xxx $
 
   130 xxx $
 
   124 ignore $Id$
 
   131 ignore $Id$
 
   125 % check whether expansion is filewise
 
   132 % check whether expansion is filewise
 
   126 % commit c
 
   133 % commit c
 
   127 adding c
 
   134 adding c
 
   128 % force expansion
 
   135 % force expansion
 
   129 overwriting a expanding keywords
 
   136 overwriting a expanding keywords
 
   130 overwriting c expanding keywords
 
   137 overwriting c expanding keywords
 
   131 % compare changenodes in a c
 
   138 % compare changenodes in a c
 
   132 expand $Id: a,v 7f0665a496fd 1970/01/01 00:00:00 user $
 
   139 expand $Id: a,v 475643d17242 1970/01/01 00:00:00 user $
 
   133 do not process $Id:
 
   140 do not process $Id:
 
   134 xxx $
 
   141 xxx $
 
   135 $Id: c,v 7fefeeacf359 1970/01/01 00:00:01 user $
 
   142 $Id: c,v c08ff8b9d54e 1970/01/01 00:00:01 user $
 
   136 tests for different changenodes
 
   143 tests for different changenodes
 
   137 % qinit -c
 
   144 % qinit -c
 
   138 % qimport
 
   145 % qimport
 
   139 % qcommit
 
   146 % qcommit
 
   140 % keywords should not be expanded in patch
 
   147 % keywords should not be expanded in patch
 
   141 # HG changeset patch
 
   148 # HG changeset patch
 
   142 # User User Name <user@example.com>
 
   149 # User User Name <user@example.com>
 
   143 # Date 1 0
 
   150 # Date 1 0
 
   144 # Node ID 7fefeeacf3596ca401a248c183c2314cbf4661ee
 
   151 # Node ID c08ff8b9d54ebf87b428631bd34b3d8b69cbf72f
 
   145 # Parent  7f0665a496fd37c3627191bd02e26a1e230f2aa2
 
   152 # Parent  475643d17242703d20c30af0fc52b30fd231c6f6
 
   146 cndiff
 
   153 cndiff
 
   147 
   154 
   148 diff -r 7f0665a496fd -r 7fefeeacf359 c
 
   155 diff -r 475643d17242 -r c08ff8b9d54e c
 
   149 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 
   156 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 
   150 +++ b/c	Thu Jan 01 00:00:01 1970 +0000
 
   157 +++ b/c	Thu Jan 01 00:00:01 1970 +0000
 
   151 @@ -0,0 +1,2 @@
 
   158 @@ -0,0 +1,2 @@
 
   152 +$Id$
 
   159 +$Id$
 
   153 +tests for different changenodes
 
   160 +tests for different changenodes
 
   155 Patch queue now empty
 
   162 Patch queue now empty
 
   156 % qpush
 
   163 % qpush
 
   157 applying mqtest.diff
 
   164 applying mqtest.diff
 
   158 Now at: mqtest.diff
 
   165 Now at: mqtest.diff
 
   159 % cat
 
   166 % cat
 
   160 $Id: c,v 7fefeeacf359 1970/01/01 00:00:01 user $
 
   167 $Id: c,v c08ff8b9d54e 1970/01/01 00:00:01 user $
 
   161 tests for different changenodes
 
   168 tests for different changenodes
 
   162 % qpop and move on
 
   169 % qpop and move on
 
   163 Patch queue now empty
 
   170 Patch queue now empty
 
   164 % copy
 
   171 % copy
 
   165 % kwfiles added
 
   172 % kwfiles added
 
   168 % commit
 
   175 % commit
 
   169 c
 
   176 c
 
   170  c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292
 
   177  c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292
 
   171 overwriting c expanding keywords
 
   178 overwriting c expanding keywords
 
   172 % cat a c
 
   179 % cat a c
 
   173 expand $Id: a,v 7f0665a496fd 1970/01/01 00:00:00 user $
 
   180 expand $Id: a,v 475643d17242 1970/01/01 00:00:00 user $
 
   174 do not process $Id:
 
   181 do not process $Id:
 
   175 xxx $
 
   182 xxx $
 
   176 expand $Id: c,v 6a127771f5db 1970/01/01 00:00:01 user $
 
   183 expand $Id: c,v 1acf8f3ab611 1970/01/01 00:00:01 user $
 
   177 do not process $Id:
 
   184 do not process $Id:
 
   178 xxx $
 
   185 xxx $
 
   179 % touch copied c after 1 second
 
   186 % touch copied c after 1 second
 
   180 % status
 
   187 % status
 
   181 % kwfiles
 
   188 % kwfiles
 
   182 a
 
   189 a
 
   183 c
 
   190 c
 
   184 % diff --rev
 
   191 % diff --rev
 
   185 diff -r 7f0665a496fd c
 
   192 diff -r 475643d17242 c
 
   186 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 
   193 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 
   187 @@ -0,0 +1,3 @@
 
   194 @@ -0,0 +1,3 @@
 
   188 +expand $Id$
 
   195 +expand $Id$
 
   189 +do not process $Id:
 
   196 +do not process $Id:
 
   190 +xxx $
 
   197 +xxx $
 
   204 demo.txt = 
   211 demo.txt = 
   205 [keywordmaps]
 
   212 [keywordmaps]
 
   206 Xinfo = {author}: {desc}
 
   213 Xinfo = {author}: {desc}
 
   207 $Xinfo: test: hg keyword config and expansion example $
 
   214 $Xinfo: test: hg keyword config and expansion example $
 
   208 % cat
 
   215 % cat
 
   209 expand $Id: a,v 7f0665a496fd 1970/01/01 00:00:00 user $
 
   216 expand $Id: a,v 475643d17242 1970/01/01 00:00:00 user $
 
   210 do not process $Id:
 
   217 do not process $Id:
 
   211 xxx $
 
   218 xxx $
 
   212 ignore $Id$
 
   219 ignore $Id$
 
   213 % hg cat
 
   220 % hg cat
 
   214 expand $Id: a 7f0665a496fd Thu, 01 Jan 1970 00:00:00 +0000 user $
 
   221 expand $Id: a 475643d17242 Thu, 01 Jan 1970 00:00:00 +0000 user $
 
   215 do not process $Id:
 
   222 do not process $Id:
 
   216 xxx $
 
   223 xxx $
 
   217 ignore $Id$
 
   224 ignore $Id$
 
   218 % commit
 
   225 % commit
 
   219 a
 
   226 a
 
   220 overwriting a expanding keywords
 
   227 overwriting a expanding keywords
 
   221 % status
 
   228 % status
 
   222 % cat
 
   229 % cat
 
   223 expand $Id: a 576a35651b0a Thu, 01 Jan 1970 00:00:02 +0000 user $
 
   230 expand $Id: a 9ea11ce3ca13 Thu, 01 Jan 1970 00:00:02 +0000 user $
 
   224 do not process $Id:
 
   231 do not process $Id:
 
   225 xxx $
 
   232 xxx $
 
   226 $Xinfo: User Name <user@example.com>: firstline $
 
   233 $Xinfo: User Name <user@example.com>: firstline $
 
   227 ignore $Id$
 
   234 ignore $Id$
 
   228 % hg cat
 
   235 % hg cat
 
   229 expand $Id: a 576a35651b0a Thu, 01 Jan 1970 00:00:02 +0000 user $
 
   236 expand $Id: a 9ea11ce3ca13 Thu, 01 Jan 1970 00:00:02 +0000 user $
 
   230 do not process $Id:
 
   237 do not process $Id:
 
   231 xxx $
 
   238 xxx $
 
   232 $Xinfo: User Name <user@example.com>: firstline $
 
   239 $Xinfo: User Name <user@example.com>: firstline $
 
   233 ignore $Id$
 
   240 ignore $Id$
 
   234 % remove
 
   241 % remove
 
   237 rolling back last transaction
 
   244 rolling back last transaction
 
   238 % status
 
   245 % status
 
   239 R a
 
   246 R a
 
   240 % revert a
 
   247 % revert a
 
   241 % cat a
 
   248 % cat a
 
   242 expand $Id: a 576a35651b0a Thu, 01 Jan 1970 00:00:02 +0000 user $
 
   249 expand $Id: a 9ea11ce3ca13 Thu, 01 Jan 1970 00:00:02 +0000 user $
 
   243 do not process $Id:
 
   250 do not process $Id:
 
   244 xxx $
 
   251 xxx $
 
   245 $Xinfo: User Name <user@example.com>: firstline $
 
   252 $Xinfo: User Name <user@example.com>: firstline $
 
   246 % clone to test incoming
 
   253 % clone to test incoming
 
   247 requesting all changes
 
   254 requesting all changes
 
   248 adding changesets
 
   255 adding changesets
 
   249 adding manifests
 
   256 adding manifests
 
   250 adding file changes
 
   257 adding file changes
 
   251 added 1 changesets with 2 changes to 2 files
 
   258 added 2 changesets with 3 changes to 3 files
 
   252 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   259 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   253 % incoming
 
   260 % incoming
 
   254 searching for changes
 
   261 searching for changes
 
   255 changeset:   1:576a35651b0a
 
   262 changeset:   2:9ea11ce3ca13
 
   256 tag:         tip
 
   263 tag:         tip
 
   257 user:        User Name <user@example.com>
 
   264 user:        User Name <user@example.com>
 
   258 date:        Thu Jan 01 00:00:02 1970 +0000
 
   265 date:        Thu Jan 01 00:00:02 1970 +0000
 
   259 summary:     firstline
 
   266 summary:     firstline
 
   260 
   267 
   266 abort: outstanding uncommitted changes in given files
 
   273 abort: outstanding uncommitted changes in given files
 
   267 x/a
 
   274 x/a
 
   268  x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e
 
   275  x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e
 
   269 overwriting x/a expanding keywords
 
   276 overwriting x/a expanding keywords
 
   270 % cat a
 
   277 % cat a
 
   271 expand $Id: x/a 2d19a72f00da Thu, 01 Jan 1970 00:00:03 +0000 user $
 
   278 expand $Id: x/a 93c8b61c99cd Thu, 01 Jan 1970 00:00:03 +0000 user $
 
   272 do not process $Id:
 
   279 do not process $Id:
 
   273 xxx $
 
   280 xxx $
 
   274 $Xinfo: User Name <user@example.com>: xa $
 
   281 $Xinfo: User Name <user@example.com>: xa $
 
   275 % kwshrink a inside directory x
 
   282 % kwshrink a inside directory x
 
   276 overwriting x/a shrinking keywords
 
   283 overwriting x/a shrinking keywords
 
   290 do not process $Id:
 
   297 do not process $Id:
 
   291 xxx $
 
   298 xxx $
 
   292 $Xinfo$
 
   299 $Xinfo$
 
   293 ignore $Id$
 
   300 ignore $Id$
 
   294 % hg cat
 
   301 % hg cat
 
   295 expand $Id: a 576a35651b0a Thu, 01 Jan 1970 00:00:02 +0000 user $
 
   302 expand $Id: a 9ea11ce3ca13 Thu, 01 Jan 1970 00:00:02 +0000 user $
 
   296 do not process $Id:
 
   303 do not process $Id:
 
   297 xxx $
 
   304 xxx $
 
   298 $Xinfo: User Name <user@example.com>: firstline $
 
   305 $Xinfo: User Name <user@example.com>: firstline $
 
   299 ignore $Id$
 
   306 ignore $Id$
 
   300 % cat
 
   307 % cat
test