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

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

largefiles: access to specific fields only if largefiles enabled (issue4547)...
largefiles: access to specific fields only if largefiles enabled (issue4547) Even if largefiles extension is enabled in a repository, "repo" object, which isn't "largefiles.reposetup()"-ed, is passed to overridden functions in the cases below unexpectedly, because extensions are enabled for each repositories strictly. (1) clone without -U: (2) pull with -U: (3) pull with --rebase: combination of "enabled@src", "disabled@dst" and "not-required@src" cause this situation. largefiles requirement @src @dst @src result -------- -------- --------------- -------------------- enabled disabled not-required aborted unexpectedly required requirement error (intentional) -------- -------- --------------- -------------------- enabled enabled * success -------- -------- --------------- -------------------- disabled enabled * success (only for "pull") -------- -------- --------------- -------------------- disabled disabled not-required success required requirement error (intentional) -------- -------- --------------- -------------------- (4) update/revert with a subrepo disabling largefiles In these cases, overridden functions cause accessing to largefiles specific fields of not "largefiles.reposetup()"-ed "repo" object, and execution is aborted. - (1), (2), (4) cause accessing to "_lfstatuswriters" in "getstatuswriter()" invoked via "updatelfiles()" - (3) causes accessing to "_lfcommithooks" in "overriderebase()" For safe accessing to these fields, this patch examines whether passed "repo" object is "largefiles.reposetup()"-ed or not before accessing to them. This patch chooses examining existence of newly introduced "_largefilesenabled" instead of "_lfcommithooks" and "_lfstatuswriters" directly, because the former is better name for the generic "largefiles is enabled in this repo" mark than the latter. In the future, all other overridden functions should avoid largefiles specific processing for efficiency, and "_largefilesenabled" is better also for such purpose. BTW, "lfstatus" can't be used for such purpose, because some code paths set it forcibly regardless of existence of it in specified "repo" object.
Wagner Bruna - - Load All Authors

File last commit:

r23917:3cbb5bf4 default
r24158:d414c28d stable
Show More
test-rebase-conflicts.t
327 lines | 8.4 KiB | text/troff | Tads3Lexer
/ tests / test-rebase-conflicts.t
History | Source | Raw |Copy content |Copy permalink
Adrian Buehlmann
tests: unify test-rebase*
 r12608 $ cat >> $HGRCPATH <<EOF
> [extensions]
> rebase=
>
Pierre-Yves David
phases: prevent rebase to rebase immutable changeset.
 r15742 > [phases]
> publish=False
>
Adrian Buehlmann
tests: unify test-rebase*
 r12608 > [alias]
Durham Goode
rebase: restore active bookmark after rebase --continue...
 r18755 > tglog = log -G --template "{rev}:{phase} '{desc}' {branches} {bookmarks}\n"
Adrian Buehlmann
tests: unify test-rebase*
 r12608 > EOF
$ hg init a
$ cd a
$ echo c1 >common
$ hg add common
$ hg ci -m C1
$ echo c2 >>common
$ hg ci -m C2
$ echo c3 >>common
$ hg ci -m C3
$ hg up -q -C 1
$ echo l1 >>extra
$ hg add extra
$ hg ci -m L1
created new head
$ sed -e 's/c2/l2/' common > common.new
$ mv common.new common
$ hg ci -m L2
$ echo l3 >> extra2
$ hg add extra2
$ hg ci -m L3
Durham Goode
rebase: restore active bookmark after rebase --continue...
 r18755 $ hg bookmark mybook
Adrian Buehlmann
tests: unify test-rebase*
 r12608
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
rebase: fix phases movement...
 r15917 $ hg phase --force --secret 4
Adrian Buehlmann
tests: unify test-rebase*
 r12608 $ hg tglog
Durham Goode
rebase: restore active bookmark after rebase --continue...
 r18755 @ 5:secret 'L3' mybook
Adrian Buehlmann
tests: unify test-rebase*
 r12608 |
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
rebase: fix phases movement...
 r15917 o 4:secret 'L2'
Adrian Buehlmann
tests: unify test-rebase*
 r12608 |
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
rebase: fix phases movement...
 r15917 o 3:draft 'L1'
Adrian Buehlmann
tests: unify test-rebase*
 r12608 |
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
rebase: fix phases movement...
 r15917 | o 2:draft 'C3'
Adrian Buehlmann
tests: unify test-rebase*
 r12608 |/
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
rebase: fix phases movement...
 r15917 o 1:draft 'C2'
Adrian Buehlmann
tests: unify test-rebase*
 r12608 |
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
rebase: fix phases movement...
 r15917 o 0:draft 'C1'
Adrian Buehlmann
tests: unify test-rebase*
 r12608
Try to call --continue:
$ hg rebase --continue
abort: no rebase in progress
[255]
Conflicting rebase:
$ hg rebase -s 3 -d 2
Mads Kiilerich
rebase: show more useful status information while rebasing...
 r23517 rebasing 3:3163e20567cc "L1"
rebasing 4:46f0b057b5c0 "L2"
Adrian Buehlmann
tests: unify test-rebase*
 r12608 merging common
warning: conflicts during merge.
Matt Mackall
merge: give a special message for internal:merge failure (issue3105)
 r15501 merging common incomplete! (edit conflicts, then use 'hg resolve --mark')
Augie Fackler
rebase: switch from util.Abort to util.InterventionRequired where appropriate (bc)
 r18933 unresolved conflicts (see hg resolve, then hg rebase --continue)
Augie Fackler
dispatch: exit with status 1 for an InterventionRequired exception (bc)
 r18935 [1]
Adrian Buehlmann
tests: unify test-rebase*
 r12608
Try to continue without solving the conflict:
Mads Kiilerich
check-code: fix check for trailing whitespace on sh command lines...
 r17345 $ hg rebase --continue
Mads Kiilerich
rebase: show more useful status information while rebasing...
 r23517 already rebased 3:3163e20567cc "L1" as 3e046f2ecedb
rebasing 4:46f0b057b5c0 "L2"
Wagner Bruna
messages: quote "hg help" hints consistently
 r23917 abort: unresolved merge conflicts (see "hg help resolve")
Adrian Buehlmann
tests: unify test-rebase*
 r12608 [255]
Conclude rebase:
$ echo 'resolved merge' >common
$ hg resolve -m common
Pierre-Yves David
resolve: add parenthesis around "no more unresolved files" message...
 r21947 (no more unresolved files)
Adrian Buehlmann
tests: unify test-rebase*
 r12608 $ hg rebase --continue
Mads Kiilerich
rebase: show more useful status information while rebasing...
 r23517 already rebased 3:3163e20567cc "L1" as 3e046f2ecedb
rebasing 4:46f0b057b5c0 "L2"
rebasing 5:8029388f38dc "L3" (mybook)
Durham Goode
bundles: do not overwrite existing backup bundles (BC)...
 r23835 saved backup bundle to $TESTTMP/a/.hg/strip-backup/3163e20567cc-5ca4656e-backup.hg (glob)
Adrian Buehlmann
tests: unify test-rebase*
 r12608
$ hg tglog
Durham Goode
rebase: restore active bookmark after rebase --continue...
 r18755 @ 5:secret 'L3' mybook
Adrian Buehlmann
tests: unify test-rebase*
 r12608 |
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
rebase: fix phases movement...
 r15917 o 4:secret 'L2'
Adrian Buehlmann
tests: unify test-rebase*
 r12608 |
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
rebase: fix phases movement...
 r15917 o 3:draft 'L1'
Adrian Buehlmann
tests: unify test-rebase*
 r12608 |
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
rebase: fix phases movement...
 r15917 o 2:draft 'C3'
Adrian Buehlmann
tests: unify test-rebase*
 r12608 |
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
rebase: fix phases movement...
 r15917 o 1:draft 'C2'
Adrian Buehlmann
tests: unify test-rebase*
 r12608 |
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
rebase: fix phases movement...
 r15917 o 0:draft 'C1'
Adrian Buehlmann
tests: unify test-rebase*
 r12608
Check correctness:
$ hg cat -r 0 common
c1
$ hg cat -r 1 common
c1
c2
$ hg cat -r 2 common
c1
c2
c3
$ hg cat -r 3 common
c1
c2
c3
$ hg cat -r 4 common
resolved merge
$ hg cat -r 5 common
resolved merge
Durham Goode
rebase: restore active bookmark after rebase --continue...
 r18755 Bookmark stays active after --continue
$ hg bookmarks
* mybook 5:d67b21408fc0
Mads Kiilerich
tests: add missing trailing 'cd ..'...
 r16913 $ cd ..
Pierre-Yves David
rebase: fix selection of base used when rebasing merge (issue4041)...
 r19969
Check that the right ancestors is used while rebasing a merge (issue4041)
$ hg clone "$TESTDIR/bundles/issue4041.hg" issue4041
requesting all changes
adding changesets
adding manifests
adding file changes
added 11 changesets with 8 changes to 3 files (+1 heads)
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd issue4041
$ hg log -G
o changeset: 10:2f2496ddf49d
|\ branch: f1
| | tag: tip
| | parent: 7:4c9fbe56a16f
| | parent: 9:e31216eec445
| | user: szhang
| | date: Thu Sep 05 12:59:39 2013 -0400
| | summary: merge
| |
| o changeset: 9:e31216eec445
| | branch: f1
| | user: szhang
| | date: Thu Sep 05 12:59:10 2013 -0400
| | summary: more changes to f1
| |
| o changeset: 8:8e4e2c1a07ae
| |\ branch: f1
| | | parent: 2:4bc80088dc6b
| | | parent: 6:400110238667
| | | user: szhang
| | | date: Thu Sep 05 12:57:59 2013 -0400
| | | summary: bad merge
| | |
o | | changeset: 7:4c9fbe56a16f
|/ / branch: f1
| | parent: 2:4bc80088dc6b
| | user: szhang
| | date: Thu Sep 05 12:54:00 2013 -0400
| | summary: changed f1
| |
| o changeset: 6:400110238667
| | branch: f2
| | parent: 4:12e8ec6bb010
| | user: szhang
| | date: Tue Sep 03 13:58:02 2013 -0400
| | summary: changed f2 on f2
| |
| | @ changeset: 5:d79e2059b5c0
| | | parent: 3:8a951942e016
| | | user: szhang
| | | date: Tue Sep 03 13:57:39 2013 -0400
| | | summary: changed f2 on default
| | |
| o | changeset: 4:12e8ec6bb010
| |/ branch: f2
| | user: szhang
| | date: Tue Sep 03 13:57:18 2013 -0400
| | summary: created f2 branch
| |
| o changeset: 3:8a951942e016
| | parent: 0:24797d4f68de
| | user: szhang
| | date: Tue Sep 03 13:57:11 2013 -0400
| | summary: added f2.txt
| |
o | changeset: 2:4bc80088dc6b
| | branch: f1
| | user: szhang
| | date: Tue Sep 03 13:56:20 2013 -0400
| | summary: added f1.txt
| |
o | changeset: 1:ef53c9e6b608
|/ branch: f1
| user: szhang
| date: Tue Sep 03 13:55:26 2013 -0400
| summary: created f1 branch
|
o changeset: 0:24797d4f68de
user: szhang
date: Tue Sep 03 13:55:08 2013 -0400
summary: added default.txt
$ hg rebase -s9 -d2 --debug # use debug to really check merge base used
Mads Kiilerich
rebase: fix 'rebase onto %d starting from %s' - show root instead of list repr...
 r20545 rebase onto 2 starting from e31216eec445
Mads Kiilerich
rebase: improve debug messages while processing the list of rebases
 r23519 ignoring null merge rebase of 3
ignoring null merge rebase of 4
ignoring null merge rebase of 6
ignoring null merge rebase of 8
Mads Kiilerich
rebase: show more useful status information while rebasing...
 r23517 rebasing 9:e31216eec445 "more changes to f1"
Pierre-Yves David
rebase: fix selection of base used when rebasing merge (issue4041)...
 r19969 rebasing: 9:e31216eec445 5/6 changesets (83.33%)
future parents are 2 and -1
rebase status stored
update to 2:4bc80088dc6b
resolving manifests
branchmerge: False, force: True, partial: False
ancestor: d79e2059b5c0+, local: d79e2059b5c0+, remote: 4bc80088dc6b
f2.txt: other deleted -> r
removing f2.txt
updating: f2.txt 1/2 files (50.00%)
Mads Kiilerich
merge: change debug logging - test output changes but no real changes...
 r21391 f1.txt: remote created -> g
Pierre-Yves David
rebase: fix selection of base used when rebasing merge (issue4041)...
 r19969 getting f1.txt
updating: f1.txt 2/2 files (100.00%)
merge against 9:e31216eec445
detach base 8:8e4e2c1a07ae
searching for copies back to rev 3
resolving manifests
branchmerge: True, force: True, partial: False
ancestor: 8e4e2c1a07ae, local: 4bc80088dc6b+, remote: e31216eec445
f1.txt: remote is newer -> g
getting f1.txt
updating: f1.txt 1/1 files (100.00%)
Mads Kiilerich
localrepo: show headline notes in commitctx before showing filenames...
 r23749 committing files:
Pierre-Yves David
rebase: fix selection of base used when rebasing merge (issue4041)...
 r19969 f1.txt
Mads Kiilerich
localrepo: show headline notes in commitctx before showing filenames...
 r23749 committing manifest
committing changelog
Mads Kiilerich
rebase: improve debug messages while processing the list of rebases
 r23519 rebased as 19c888675e13
Mads Kiilerich
rebase: show more useful status information while rebasing...
 r23517 rebasing 10:2f2496ddf49d "merge" (tip)
Pierre-Yves David
rebase: fix selection of base used when rebasing merge (issue4041)...
 r19969 rebasing: 10:2f2496ddf49d 6/6 changesets (100.00%)
future parents are 11 and 7
rebase status stored
already in target
merge against 10:2f2496ddf49d
detach base 9:e31216eec445
searching for copies back to rev 3
resolving manifests
branchmerge: True, force: True, partial: False
ancestor: e31216eec445, local: 19c888675e13+, remote: 2f2496ddf49d
f1.txt: remote is newer -> g
getting f1.txt
updating: f1.txt 1/1 files (100.00%)
Mads Kiilerich
localrepo: show headline notes in commitctx before showing filenames...
 r23749 committing files:
Pierre-Yves David
rebase: fix selection of base used when rebasing merge (issue4041)...
 r19969 f1.txt
Mads Kiilerich
localrepo: show headline notes in commitctx before showing filenames...
 r23749 committing manifest
committing changelog
Mads Kiilerich
rebase: improve debug messages while processing the list of rebases
 r23519 rebased as 2a7f09cac94c
Pierre-Yves David
rebase: fix selection of base used when rebasing merge (issue4041)...
 r19969 rebase merging completed
update back to initial working directory parent
resolving manifests
branchmerge: False, force: False, partial: False
ancestor: 2a7f09cac94c, local: 2a7f09cac94c+, remote: d79e2059b5c0
f1.txt: other deleted -> r
removing f1.txt
updating: f1.txt 1/2 files (50.00%)
Mads Kiilerich
merge: change debug logging - test output changes but no real changes...
 r21391 f2.txt: remote created -> g
Pierre-Yves David
rebase: fix selection of base used when rebasing merge (issue4041)...
 r19969 getting f2.txt
updating: f2.txt 2/2 files (100.00%)
3 changesets found
list of changesets:
4c9fbe56a16f30c0d5dcc40ec1a97bbe3325209c
e31216eec445e44352c5f01588856059466a24c9
2f2496ddf49d69b5ef23ad8cf9fb2e0e4faf0ac2
bundling: 1/3 changesets (33.33%)
bundling: 2/3 changesets (66.67%)
bundling: 3/3 changesets (100.00%)
bundling: 1/3 manifests (33.33%)
bundling: 2/3 manifests (66.67%)
bundling: 3/3 manifests (100.00%)
bundling: f1.txt 1/1 files (100.00%)
Durham Goode
bundles: do not overwrite existing backup bundles (BC)...
 r23835 saved backup bundle to $TESTTMP/issue4041/.hg/strip-backup/e31216eec445-15f7a814-backup.hg (glob)
Pierre-Yves David
rebase: fix selection of base used when rebasing merge (issue4041)...
 r19969 3 changesets found
list of changesets:
4c9fbe56a16f30c0d5dcc40ec1a97bbe3325209c
19c888675e133ab5dff84516926a65672eaf04d9
2a7f09cac94c7f4b73ebd5cd1a62d3b2e8e336bf
bundling: 1/3 changesets (33.33%)
bundling: 2/3 changesets (66.67%)
bundling: 3/3 changesets (100.00%)
bundling: 1/3 manifests (33.33%)
bundling: 2/3 manifests (66.67%)
bundling: 3/3 manifests (100.00%)
bundling: f1.txt 1/1 files (100.00%)
adding branch
adding changesets
changesets: 1 chunks
add changeset 4c9fbe56a16f
changesets: 2 chunks
add changeset 19c888675e13
changesets: 3 chunks
add changeset 2a7f09cac94c
adding manifests
manifests: 1/2 chunks (50.00%)
manifests: 2/2 chunks (100.00%)
manifests: 3/2 chunks (150.00%)
adding file changes
adding f1.txt revisions
files: 1/1 chunks (100.00%)
added 2 changesets with 2 changes to 1 files
invalid branchheads cache (served): tip differs
Mads Kiilerich
branchcache: add debug output whenever cache files use truncate...
 r23862 truncating cache/rbc-revs-v1 to 72
Pierre-Yves David
rebase: fix selection of base used when rebasing merge (issue4041)...
 r19969 rebase completed
updating the branch cache