##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

subrepo: avoids empty commit when .hgsubstate is dirty (issue2403)...
subrepo: avoids empty commit when .hgsubstate is dirty (issue2403) This patch avoids empty commit when .hgsubstate is dirty. Empty commit was caused by .hgsubstate being updated back to the state of the working copy parent when committing, if a user had changed it manually and not made any changes in subrepositories. The subrepository state from the working copies parent is compared with the state calculated as a result of trying to commit the subrepositories. If the two states are the same, then return None otherwise the commit is just done. The line: "committing subrepository x" will be written if there is nothing committed, but .hgsubstate is dirty for x subrepository.
Martin Geisler - - Load All Authors

File last commit:

r12399:4fee1fd3 default
r13155:f02d7a56 default
Show More
test-locate.t
121 lines | 1.4 KiB | text/troff | Tads3Lexer
/ tests / test-locate.t
History | Source | Raw |Copy content |Copy permalink
Adrian Buehlmann
tests: unify test-locate
 r12206 $ mkdir t
$ cd t
$ hg init
$ echo 0 > a
$ echo 0 > b
$ echo 0 > t.h
$ mkdir t
$ echo 0 > t/x
$ echo 0 > t/b
$ echo 0 > t/e.h
$ mkdir dir.h
$ echo 0 > dir.h/foo
$ hg ci -A -m m
adding a
adding b
adding dir.h/foo
adding t.h
adding t/b
adding t/e.h
adding t/x
$ touch nottracked
Matt Mackall
tests: cleanup exit code handling in unified tests
 r12365 $ hg locate a
Adrian Buehlmann
tests: unify test-locate
 r12206 a
Matt Mackall
tests: cleanup exit code handling in unified tests
 r12365 $ hg locate NONEXISTENT
[1]
Adrian Buehlmann
tests: unify test-locate
 r12206
$ hg locate
a
b
dir.h/foo
t.h
t/b
t/e.h
t/x
$ hg rm a
$ hg ci -m m
$ hg locate a
Matt Mackall
tests: add exit codes to unified tests
 r12316 [1]
Adrian Buehlmann
tests: unify test-locate
 r12206 $ hg locate NONEXISTENT
Matt Mackall
tests: add exit codes to unified tests
 r12316 [1]
Adrian Buehlmann
tests: unify test-locate
 r12206 $ hg locate relpath:NONEXISTENT
Matt Mackall
tests: add exit codes to unified tests
 r12316 [1]
Adrian Buehlmann
tests: unify test-locate
 r12206 $ hg locate
b
dir.h/foo
t.h
t/b
t/e.h
t/x
$ hg locate -r 0 a
a
$ hg locate -r 0 NONEXISTENT
Matt Mackall
tests: add exit codes to unified tests
 r12316 [1]
Adrian Buehlmann
tests: unify test-locate
 r12206 $ hg locate -r 0 relpath:NONEXISTENT
Matt Mackall
tests: add exit codes to unified tests
 r12316 [1]
Adrian Buehlmann
tests: unify test-locate
 r12206 $ hg locate -r 0
a
b
dir.h/foo
t.h
t/b
t/e.h
t/x
-I/-X with relative path should work:
$ cd t
$ hg locate
b
dir.h/foo
t.h
t/b
t/e.h
t/x
$ hg locate -I ../t
t/b
t/e.h
t/x
Martin Geisler
tests: added a short description to issue numbers...
 r12399 Issue294: hg remove --after dir fails when dir.* also exists
Adrian Buehlmann
tests: unify test-locate
 r12206
$ cd ..
$ rm -r t
$ hg locate 't/**'
t/b
t/e.h
t/x
$ mkdir otherdir
$ cd otherdir
$ hg locate b
../b
../t/b
$ hg locate '*.h'
../t.h
../t/e.h
$ hg locate path:t/x
../t/x
$ hg locate 're:.*\.h$'
../t.h
../t/e.h
$ hg locate -r 0 b
../b
../t/b
$ hg locate -r 0 '*.h'
../t.h
../t/e.h
$ hg locate -r 0 path:t/x
../t/x
$ hg locate -r 0 're:.*\.h$'
../t.h
../t/e.h