##// END OF EJS Templates
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper...
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper Code paths below expect "hg.updaterepo" (or "hg.update" using it) to execute linear merging: - "update" in commands - "postincoming" in commands, used for: - "hg pull --update" - "hg unbundle --update" - "hgsubrepo.get" in subrepo For linear merging with largefiles, standins should be updated according to (possibly dirty) largefiles before "merge.update" invocation to detect conflicts correctly. Before this patch, only the "update" command can execute linear merging correctly, because largefiles extension takes care of only it. This patch moves "updatestandin" invocation from "overrideupdate" ("hg update" wrapper) to "_hgupdaterepo" ("hg.updaterepo" wrapper) to execute linear merging in "hg.updaterepo" correctly. This is also a preparation to centralize the logic of updating largefiles in the working directory into the function wrapping "merge.update" in the subsequent patch.

File last commit:

r19380:ee07f9d1 default
r22287:f3ac9677 default
Show More
test-subrepo-paths.t
61 lines | 1.2 KiB | text/troff | Tads3Lexer
/ tests / test-subrepo-paths.t
Martin Geisler
tests: unify test-subrepo-paths
r11914 $ hg init outer
$ cd outer
Martin Geisler
subrepo: try remapping subpaths using the "final" path...
r15150 $ echo '[paths]' >> .hg/hgrc
$ echo 'default = http://example.net/' >> .hg/hgrc
Martin Geisler
test-subrepo-paths: moved comment lines to where they belong
r11959 hg debugsub with no remapping
Martin Geisler
subrepo: try remapping subpaths using the "final" path...
r15150 $ echo 'sub = libfoo' > .hgsub
Martin Geisler
tests: unify test-subrepo-paths
r11914 $ hg add .hgsub
$ hg debugsub
path sub
Martin Geisler
subrepo: try remapping subpaths using the "final" path...
r15150 source libfoo
Martin Geisler
tests: unify test-subrepo-paths
r11914 revision
Martin Geisler
test-subrepo-paths: moved comment lines to where they belong
r11959 hg debugsub with remapping
Martin Geisler
subrepo: try remapping subpaths using the "final" path...
r15150 $ echo '[subpaths]' >> .hg/hgrc
Simon Heimberg
check-code: do not warn on printf \\x or \\[1-9]...
r19380 $ printf 'http://example.net/lib(.*) = C:\\libs\\\\1-lib\\\n' >> .hg/hgrc
Martin Geisler
tests: unify test-subrepo-paths
r11914
$ hg debugsub
path sub
Martin Geisler
subrepos: handle backslashes in subpaths
r11961 source C:\libs\foo-lib\
Martin Geisler
tests: unify test-subrepo-paths
r11914 revision
Martin Geisler
test-subrepo-paths: fix typo
r13582 test cumulative remapping, the $HGRCPATH file is loaded first
Martin Geisler
test-subrepo-paths: test cummulative remapping
r13578
$ echo '[subpaths]' >> $HGRCPATH
$ echo 'libfoo = libbar' >> $HGRCPATH
$ hg debugsub
path sub
source C:\libs\bar-lib\
revision
Martin Geisler
subrepo: try remapping subpaths using the "final" path...
r15150 test absolute source path -- testing with a URL is important since
standard os.path.join wont treat that as an absolute path
$ echo 'abs = http://example.net/abs' > .hgsub
$ hg debugsub
path abs
source http://example.net/abs
revision
$ echo 'abs = /abs' > .hgsub
$ hg debugsub
path abs
source /abs
revision
Martin Geisler
tests: unify test-subrepo-paths
r11914 test bad subpaths pattern
$ cat > .hg/hgrc <<EOF
> [subpaths]
> .* = \1
> EOF
$ hg debugsub
Mads Kiilerich
tests: make (glob) on windows accept \ instead of /...
r15447 abort: bad subrepository pattern in $TESTTMP/outer/.hg/hgrc:2: invalid group reference (glob)
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913
$ cd ..