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

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

subrepo: calculate _relpath for hgsubrepo based on self instead of parent...
subrepo: calculate _relpath for hgsubrepo based on self instead of parent Prior to 105758d1b37b, the subrelpath() (now _relpath) for hgsubrepo was calculated by removing the root path of the outermost repo from the root path of the subrepo. Since the root paths use platform specific separators, and the relative path is printed by various commands, the output of these commands require a glob (and check-code.py enforces this). In an effort to be generic to all subrepos, 105758d1b37b started calculating this path based on the parent repo, and then joining the subrepo path in .hgsub. One of the tests in test-subrepo.t creates a subrepo inside a directory, so the path being joined contained '/' instead of '\'. This made the test fail with a '~' status, because the glob is unnecessary[1]. Removing them made the test work, but then check-code complains. We can't just drop the check-code rule, because sub-subrepos are still joined with '\'. Presumably the other subrepo types have this issue as well, but there likely isn't a test with git or svn repos inside a subdirectory. This simply restores the exact _relpath value (and output) for hgsubrepos prior to 105758d1b37b. [1] http://www.selenic.com/pipermail/mercurial-devel/2015-April/068720.html
Mads Kiilerich - - Load All Authors

File last commit:

r18342:de99de39 default
r24786:56e15db9 default
Show More
test-mq-qgoto.t
93 lines | 1.4 KiB | text/troff | Tads3Lexer
/ tests / test-mq-qgoto.t
History | Source | Raw |Copy content |Copy permalink
Adrian Buehlmann
tests: unify some of test-mq*
 r12324 $ echo "[extensions]" >> $HGRCPATH
$ echo "mq=" >> $HGRCPATH
$ hg init a
$ cd a
$ echo a > a
$ hg ci -Ama
adding a
$ hg qnew a.patch
$ echo a >> a
$ hg qrefresh
$ hg qnew b.patch
$ echo b > b
$ hg add b
$ hg qrefresh
$ hg qnew c.patch
$ echo c > c
$ hg add c
$ hg qrefresh
$ hg qgoto a.patch
popping c.patch
popping b.patch
now at: a.patch
$ hg qgoto c.patch
applying b.patch
applying c.patch
now at: c.patch
$ hg qgoto b.patch
popping c.patch
now at: b.patch
Using index:
$ hg qgoto 0
popping b.patch
now at: a.patch
$ hg qgoto 2
applying b.patch
applying c.patch
now at: c.patch
Mads Kiilerich
mq: fix qpop of working directory parent patch when not at qtip...
 r18342 No warnings when using index ... and update from non-qtip and with pending
changes in unrelated files:
Adrian Buehlmann
tests: unify some of test-mq*
 r12324
$ hg qnew bug314159
$ echo d >> c
$ hg qrefresh
$ hg qnew bug141421
Mads Kiilerich
mq: fix qpop of working directory parent patch when not at qtip...
 r18342 $ echo e >> b
Adrian Buehlmann
tests: unify some of test-mq*
 r12324 $ hg qrefresh
Mads Kiilerich
mq: fix qpop of working directory parent patch when not at qtip...
 r18342 $ hg up -r bug314159
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo f >> a
$ echo f >> b
$ echo f >> c
Adrian Buehlmann
tests: unify some of test-mq*
 r12324 $ hg qgoto 1
Mads Kiilerich
mq: fix qpop of working directory parent patch when not at qtip...
 r18342 abort: local changes found, refresh first
[255]
$ hg qgoto 1 -f
Adrian Buehlmann
tests: unify some of test-mq*
 r12324 popping bug141421
popping bug314159
popping c.patch
now at: b.patch
Mads Kiilerich
mq: fix qpop of working directory parent patch when not at qtip...
 r18342 $ hg st
M a
M b
? c.orig
$ hg up -qCr.
Adrian Buehlmann
tests: unify some of test-mq*
 r12324
$ hg qgoto 3
applying c.patch
applying bug314159
now at: bug314159
Detect ambiguous non-index:
$ hg qgoto 14
patch name "14" is ambiguous:
bug314159
bug141421
abort: patch 14 not in series
[255]
Mads Kiilerich
tests: add missing trailing 'cd ..'...
 r16913 $ cd ..