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
branchstable
changeset 392 45a318c5ea20
parent 384 482c91f8c230
child 409 6e2293f7b9f7
equal deleted inserted replaced
391:d3f114c111ff 392:45a318c5ea20 
    82 demo.txt = 
    82 demo.txt = 
    83 [keywordmaps]
 
    83 [keywordmaps]
 
    84 Branch = {branches}
 
    84 Branch = {branches}
 
    85 $Branch: demobranch $
 
    85 $Branch: demobranch $
 
    86 % kwshrink should exit silently in empty/invalid repo
 
    86 % kwshrink should exit silently in empty/invalid repo
 
    87 % cat
 
    87 pulling from test-keyword.hg
 
    88 expand $Id$
 
    88 requesting all changes
 
    89 do not process $Id:
 
    89 adding changesets
 
    90 xxx $
 
    90 adding manifests
 
       
    91 adding file changes
 
       
    92 added 1 changesets with 1 changes to 1 files
 
       
    93 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
       
    94 % cat
 
    91 expand $Id$
 
    95 expand $Id$
 
    92 do not process $Id:
 
    96 do not process $Id:
 
    93 xxx $
 
    97 xxx $
 
    94 ignore $Id$
 
    98 ignore $Id$
 
    95 % addremove
 
    99 % addremove
 
    96 adding a
 
   100 adding a
 
    97 adding b
 
   101 adding b
 
    98 adding sym
 
       
    99 % status
 
   102 % status
 
   100 A a
 
   103 A a
 
   101 A b
 
   104 A b
 
   102 A sym
 
       
   103 % default keyword expansion including commit hook
 
   105 % default keyword expansion including commit hook
 
   104 % interrupted commit should not change state or run commit hook
 
   106 % interrupted commit should not change state or run commit hook
 
   105 a
 
   107 a
 
   106 b
 
   108 b
 
   107 sym
 
       
   108 transaction abort!
 
   109 transaction abort!
 
   109 rollback completed
 
   110 rollback completed
 
   110 abort: empty commit message
 
   111 abort: empty commit message
 
   111 % status
 
   112 % status
 
   112 A a
 
   113 A a
 
   113 A b
 
   114 A b
 
   114 A sym
 
       
   115 % commit
 
   115 % commit
 
   116 a
 
   116 a
 
   117 b
 
   117 b
 
   118 sym
 
       
   119 overwriting a expanding keywords
 
   118 overwriting a expanding keywords
 
   120 running hook commit.test: cp a hooktest
 
   119 running hook commit.test: cp a hooktest
 
   121 % status
 
   120 % status
 
   122 ? hooktest
 
   121 ? hooktest
 
   123 % identify
 
   122 % identify
 
   124 f782df5f9602
 
   123 ef63ca68695b
 
   125 % cat
 
   124 % cat
 
   126 expand $Id: a,v f782df5f9602 1970/01/01 00:00:00 user $
 
   125 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
 
   127 do not process $Id:
 
   126 do not process $Id:
 
   128 xxx $
 
   127 xxx $
 
   129 expand $Id: a,v f782df5f9602 1970/01/01 00:00:00 user $
 
   128 ignore $Id$
 
   130 do not process $Id:
 
   129 % hg cat
 
   131 xxx $
 
   130 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
 
   132 ignore $Id$
 
       
   133 % hg cat
 
       
   134 expand $Id: a,v f782df5f9602 1970/01/01 00:00:00 user $
 
       
   135 do not process $Id:
 
   131 do not process $Id:
 
   136 xxx $
 
   132 xxx $
 
   137 ignore $Id$
 
   133 ignore $Id$
 
   138 a
 
   134 a
 
   139 % diff a hooktest
 
   135 % diff a hooktest
 
   140 % removing commit hook from config
 
   136 % removing commit hook from config
 
   141 % bundle
 
   137 % bundle
 
   142 1 changesets found
 
   138 2 changesets found
 
   143 % pull from bundle
 
   139 % pull from bundle
 
   144 pulling from ../kw.hg
 
   140 pulling from ../kw.hg
 
   145 requesting all changes
 
   141 requesting all changes
 
   146 adding changesets
 
   142 adding changesets
 
   147 adding manifests
 
   143 adding manifests
 
   148 adding file changes
 
   144 adding file changes
 
   149 added 1 changesets with 3 changes to 3 files
 
   145 added 2 changesets with 3 changes to 3 files
 
   150 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   146 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   151 % touch
 
   147 % touch
 
   152 % status
 
   148 % status
 
   153 % update
 
   149 % update
 
   154 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   150 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   155 % cat
 
   151 % cat
 
   156 expand $Id: a,v f782df5f9602 1970/01/01 00:00:00 user $
 
   152 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
 
   157 do not process $Id:
 
       
   158 xxx $
 
       
   159 expand $Id: a,v f782df5f9602 1970/01/01 00:00:00 user $
 
       
   160 do not process $Id:
 
   153 do not process $Id:
 
   161 xxx $
 
   154 xxx $
 
   162 ignore $Id$
 
   155 ignore $Id$
 
   163 % check whether expansion is filewise
 
   156 % check whether expansion is filewise
 
   164 % commit c
 
   157 % commit c
 
   165 adding c
 
   158 adding c
 
   166 % force expansion
 
   159 % force expansion
 
   167 overwriting a expanding keywords
 
   160 overwriting a expanding keywords
 
   168 overwriting c expanding keywords
 
   161 overwriting c expanding keywords
 
   169 % compare changenodes in a c
 
   162 % compare changenodes in a c
 
   170 expand $Id: a,v f782df5f9602 1970/01/01 00:00:00 user $
 
   163 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
 
   171 do not process $Id:
 
   164 do not process $Id:
 
   172 xxx $
 
   165 xxx $
 
   173 $Id: c,v ba4426d1938e 1970/01/01 00:00:01 user $
 
   166 $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $
 
   174 tests for different changenodes
 
   167 tests for different changenodes
 
   175 % qinit -c
 
   168 % qinit -c
 
   176 % qimport
 
   169 % qimport
 
   177 % qcommit
 
   170 % qcommit
 
   178 % keywords should not be expanded in patch
 
   171 % keywords should not be expanded in patch
 
   179 # HG changeset patch
 
   172 # HG changeset patch
 
   180 # User User Name <user@example.com>
 
   173 # User User Name <user@example.com>
 
   181 # Date 1 0
 
   174 # Date 1 0
 
   182 # Node ID ba4426d1938ec9673e03ab274d88c44e24618f7f
 
   175 # Node ID 40a904bbbe4cd4ab0a1f28411e35db26341a40ad
 
   183 # Parent  f782df5f9602483b4e51c31a12315f353bba380c
 
   176 # Parent  ef63ca68695bc9495032c6fda1350c71e6d256e9
 
   184 cndiff
 
   177 cndiff
 
   185 
   178 
   186 diff -r f782df5f9602 -r ba4426d1938e c
 
   179 diff -r ef63ca68695b -r 40a904bbbe4c c
 
   187 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 
   180 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 
   188 +++ b/c	Thu Jan 01 00:00:01 1970 +0000
 
   181 +++ b/c	Thu Jan 01 00:00:01 1970 +0000
 
   189 @@ -0,0 +1,2 @@
 
   182 @@ -0,0 +1,2 @@
 
   190 +$Id$
 
   183 +$Id$
 
   191 +tests for different changenodes
 
   184 +tests for different changenodes
 
   193 Patch queue now empty
 
   186 Patch queue now empty
 
   194 % qgoto - should imply qpush
 
   187 % qgoto - should imply qpush
 
   195 applying mqtest.diff
 
   188 applying mqtest.diff
 
   196 Now at: mqtest.diff
 
   189 Now at: mqtest.diff
 
   197 % cat
 
   190 % cat
 
   198 $Id: c,v ba4426d1938e 1970/01/01 00:00:01 user $
 
   191 $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $
 
   199 tests for different changenodes
 
   192 tests for different changenodes
 
   200 % qpop and move on
 
   193 % qpop and move on
 
   201 Patch queue now empty
 
   194 Patch queue now empty
 
   202 % copy
 
   195 % copy
 
   203 % kwfiles added
 
   196 % kwfiles added
 
   206 % commit
 
   199 % commit
 
   207 c
 
   200 c
 
   208  c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292
 
   201  c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292
 
   209 overwriting c expanding keywords
 
   202 overwriting c expanding keywords
 
   210 % cat a c
 
   203 % cat a c
 
   211 expand $Id: a,v f782df5f9602 1970/01/01 00:00:00 user $
 
   204 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
 
   212 do not process $Id:
 
   205 do not process $Id:
 
   213 xxx $
 
   206 xxx $
 
   214 expand $Id: c,v 0ba462c0f077 1970/01/01 00:00:01 user $
 
   207 expand $Id: c,v e22d299ac0c2 1970/01/01 00:00:01 user $
 
   215 do not process $Id:
 
   208 do not process $Id:
 
   216 xxx $
 
   209 xxx $
 
   217 % touch copied c after 1 second
 
   210 % touch copied c after 1 second
 
   218 % status
 
   211 % status
 
   219 % kwfiles
 
   212 % kwfiles
 
   220 a
 
   213 a
 
   221 c
 
   214 c
 
   222 % diff --rev
 
   215 % diff --rev
 
   223 diff -r f782df5f9602 c
 
   216 diff -r ef63ca68695b c
 
   224 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 
   217 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 
   225 @@ -0,0 +1,3 @@
 
   218 @@ -0,0 +1,3 @@
 
   226 +expand $Id$
 
   219 +expand $Id$
 
   227 +do not process $Id:
 
   220 +do not process $Id:
 
   228 +xxx $
 
   221 +xxx $
 
   242 demo.txt = 
   235 demo.txt = 
   243 [keywordmaps]
 
   236 [keywordmaps]
 
   244 Xinfo = {author}: {desc}
 
   237 Xinfo = {author}: {desc}
 
   245 $Xinfo: test: hg keyword config and expansion example $
 
   238 $Xinfo: test: hg keyword config and expansion example $
 
   246 % cat
 
   239 % cat
 
   247 expand $Id: a,v f782df5f9602 1970/01/01 00:00:00 user $
 
   240 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
 
   248 do not process $Id:
 
   241 do not process $Id:
 
   249 xxx $
 
   242 xxx $
 
   250 expand $Id: a,v f782df5f9602 1970/01/01 00:00:00 user $
 
   243 ignore $Id$
 
   251 do not process $Id:
 
   244 % hg cat
 
   252 xxx $
 
   245 expand $Id: a ef63ca68695b Thu, 01 Jan 1970 00:00:00 +0000 user $
 
   253 ignore $Id$
 
       
   254 % hg cat
 
       
   255 expand $Id: a f782df5f9602 Thu, 01 Jan 1970 00:00:00 +0000 user $
 
       
   256 do not process $Id:
 
   246 do not process $Id:
 
   257 xxx $
 
   247 xxx $
 
   258 ignore $Id$
 
   248 ignore $Id$
 
   259 a
 
   249 a
 
   260 % interrupted commit should not change state
 
   250 % interrupted commit should not change state
 
   267 % commit
 
   257 % commit
 
   268 a
 
   258 a
 
   269 overwriting a expanding keywords
 
   259 overwriting a expanding keywords
 
   270 % status
 
   260 % status
 
   271 % cat
 
   261 % cat
 
   272 expand $Id: a 0729690beff6 Thu, 01 Jan 1970 00:00:02 +0000 user $
 
   262 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
 
   273 do not process $Id:
 
   263 do not process $Id:
 
   274 xxx $
 
   264 xxx $
 
   275 $Xinfo: User Name <user@example.com>: firstline $
 
   265 $Xinfo: User Name <user@example.com>: firstline $
 
   276 expand $Id: a 0729690beff6 Thu, 01 Jan 1970 00:00:02 +0000 user $
 
   266 ignore $Id$
 
   277 do not process $Id:
 
   267 % hg cat
 
   278 xxx $
 
   268 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
 
   279 $Xinfo: User Name <user@example.com>: firstline $
 
       
   280 ignore $Id$
 
       
   281 % hg cat
 
       
   282 expand $Id: a 0729690beff6 Thu, 01 Jan 1970 00:00:02 +0000 user $
 
       
   283 do not process $Id:
 
   269 do not process $Id:
 
   284 xxx $
 
   270 xxx $
 
   285 $Xinfo: User Name <user@example.com>: firstline $
 
   271 $Xinfo: User Name <user@example.com>: firstline $
 
   286 ignore $Id$
 
   272 ignore $Id$
 
   287 a
 
   273 a
 
   291 rolling back last transaction
 
   277 rolling back last transaction
 
   292 % status
 
   278 % status
 
   293 R a
 
   279 R a
 
   294 % revert a
 
   280 % revert a
 
   295 % cat a
 
   281 % cat a
 
   296 expand $Id: a 0729690beff6 Thu, 01 Jan 1970 00:00:02 +0000 user $
 
   282 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
 
   297 do not process $Id:
 
   283 do not process $Id:
 
   298 xxx $
 
   284 xxx $
 
   299 $Xinfo: User Name <user@example.com>: firstline $
 
   285 $Xinfo: User Name <user@example.com>: firstline $
 
   300 % clone to test incoming
 
   286 % clone to test incoming
 
   301 requesting all changes
 
   287 requesting all changes
 
   302 adding changesets
 
   288 adding changesets
 
   303 adding manifests
 
   289 adding manifests
 
   304 adding file changes
 
   290 adding file changes
 
   305 added 1 changesets with 3 changes to 3 files
 
   291 added 2 changesets with 3 changes to 3 files
 
   306 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   292 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   307 % incoming
 
   293 % incoming
 
   308 comparing with test-keyword/Test
 
   294 comparing with test-keyword/Test
 
   309 searching for changes
 
   295 searching for changes
 
   310 changeset:   1:0729690beff6
 
   296 changeset:   2:bb948857c743
 
   311 tag:         tip
 
   297 tag:         tip
 
   312 user:        User Name <user@example.com>
 
   298 user:        User Name <user@example.com>
 
   313 date:        Thu Jan 01 00:00:02 1970 +0000
 
   299 date:        Thu Jan 01 00:00:02 1970 +0000
 
   314 summary:     firstline
 
   300 summary:     firstline
 
   315 
   301 
   318 overwriting a expanding keywords
 
   304 overwriting a expanding keywords
 
   319 % export
 
   305 % export
 
   320 % import
 
   306 % import
 
   321 applying ../rejecttest.diff
 
   307 applying ../rejecttest.diff
 
   322 % cat
 
   308 % cat
 
   323 expand $Id: a 82983f13f138 Thu, 01 Jan 1970 00:00:03 +0000 user $ rejecttest
 
   309 expand $Id: a 4e0994474d25 Thu, 01 Jan 1970 00:00:03 +0000 user $ rejecttest
 
   324 do not process $Id: rejecttest
 
       
   325 xxx $
 
       
   326 $Xinfo: User Name <user@example.com>: rejects? $
 
       
   327 expand $Id: a 82983f13f138 Thu, 01 Jan 1970 00:00:03 +0000 user $ rejecttest
 
       
   328 do not process $Id: rejecttest
 
   310 do not process $Id: rejecttest
 
   329 xxx $
 
   311 xxx $
 
   330 $Xinfo: User Name <user@example.com>: rejects? $
 
   312 $Xinfo: User Name <user@example.com>: rejects? $
 
   331 ignore $Id$
 
   313 ignore $Id$
 
   332 
   314 
   342 abort: outstanding uncommitted changes in given files
 
   324 abort: outstanding uncommitted changes in given files
 
   343 x/a
 
   325 x/a
 
   344  x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e
 
   326  x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e
 
   345 overwriting x/a expanding keywords
 
   327 overwriting x/a expanding keywords
 
   346 % cat a
 
   328 % cat a
 
   347 expand $Id: x/a f27c134d2d9b Thu, 01 Jan 1970 00:00:03 +0000 user $
 
   329 expand $Id: x/a cfa68229c116 Thu, 01 Jan 1970 00:00:03 +0000 user $
 
   348 do not process $Id:
 
   330 do not process $Id:
 
   349 xxx $
 
   331 xxx $
 
   350 $Xinfo: User Name <user@example.com>: xa $
 
   332 $Xinfo: User Name <user@example.com>: xa $
 
   351 % kwshrink a inside directory x
 
   333 % kwshrink a inside directory x
 
   352 overwriting x/a shrinking keywords
 
   334 overwriting x/a shrinking keywords
 
   354 expand $Id$
 
   336 expand $Id$
 
   355 do not process $Id:
 
   337 do not process $Id:
 
   356 xxx $
 
   338 xxx $
 
   357 $Xinfo$
 
   339 $Xinfo$
 
   358 % kwexpand nonexistent
 
   340 % kwexpand nonexistent
 
   359 nonexistent: No such file or directory
 
   341 nonexistent:
 
   360 % switch off expansion
 
   342 % switch off expansion
 
   361 % kwshrink with unknown file u
 
   343 % kwshrink with unknown file u
 
   362 overwriting a shrinking keywords
 
   344 overwriting a shrinking keywords
 
   363 overwriting x/a shrinking keywords
 
   345 overwriting x/a shrinking keywords
 
   364 % cat
 
   346 % cat
 
   365 expand $Id$
 
   347 expand $Id$
 
   366 do not process $Id:
 
   348 do not process $Id:
 
   367 xxx $
 
   349 xxx $
 
   368 $Xinfo$
 
   350 $Xinfo$
 
       
   351 ignore $Id$
 
       
   352 % hg cat
 
       
   353 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
 
       
   354 do not process $Id:
 
       
   355 xxx $
 
       
   356 $Xinfo: User Name <user@example.com>: firstline $
 
       
   357 ignore $Id$
 
       
   358 a
 
       
   359 % cat
 
   369 expand $Id$
 
   360 expand $Id$
 
   370 do not process $Id:
 
   361 do not process $Id:
 
   371 xxx $
 
   362 xxx $
 
   372 $Xinfo$
 
   363 $Xinfo$
 
   373 ignore $Id$
 
   364 ignore $Id$
 
   374 % hg cat
 
   365 % hg cat
 
   375 expand $Id: a 0729690beff6 Thu, 01 Jan 1970 00:00:02 +0000 user $
 
       
   376 do not process $Id:
 
       
   377 xxx $
 
       
   378 $Xinfo: User Name <user@example.com>: firstline $
 
       
   379 ignore $Id$
 
       
   380 a
 
       
   381 % cat
 
       
   382 expand $Id$
 
   366 expand $Id$
 
   383 do not process $Id:
 
   367 do not process $Id:
 
   384 xxx $
 
   368 xxx $
 
   385 $Xinfo$
 
   369 $Xinfo$
 
   386 expand $Id$
 
   370 ignore $Id$
 
   387 do not process $Id:
 
   371 a
 
   388 xxx $
 
       
   389 $Xinfo$
 
       
   390 ignore $Id$
 
       
   391 % hg cat
 
       
   392 expand $Id$
 
       
   393 do not process $Id:
 
       
   394 xxx $
 
       
   395 $Xinfo$
 
       
   396 ignore $Id$
 
       
   397 a
test